From 7b242851c0094d13cbaca5b68261ad92c873a59f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 10 Jul 2022 07:46:29 +0200 Subject: [PATCH] Refactor SWT directory structure. --- Makefile | 26 +++- Makefile-rcp.mk | 9 +- org.argeo.api.cli/.classpath | 7 + org.argeo.api.cli/.project | 28 ++++ org.argeo.api.cli/bnd.bnd | 0 org.argeo.api.cli/build.properties | 4 + .../argeo/api}/cli/CommandArgsException.java | 2 +- .../api}/cli/CommandRuntimeException.java | 2 +- .../src/org/argeo/api}/cli/CommandsCli.java | 2 +- .../org/argeo/api}/cli/DescribedCommand.java | 2 +- .../src/org/argeo/api}/cli/HelpCommand.java | 2 +- .../src/org/argeo/api/cli/package-info.java | 2 + .../src/org/argeo/cms/ssh/cli/SshCli.java | 17 +++ .../src/org/argeo/cms/ssh/cli/SshShell.java | 115 ++++++++++++++++ .../src/org/argeo/cms/acr/fs/FileSync.java | 4 +- .../src/org/argeo/cms/acr/fs/FsCommands.java | 2 +- .../argeo/cms/auth/AnonymousLoginModule.java | 19 ++- .../src/org/argeo/cms/cli/package-info.java | 2 - .../src/org/argeo/cms/runtime/StaticCms.java | 11 +- .../util/register/ComponentRegister.java | 14 ++ {eclipse => swt}/org.argeo.cms.e4/.classpath | 0 {eclipse => swt}/org.argeo.cms.e4/.project | 0 .../org.argeo.cms.e4/META-INF/.gitignore | 0 .../OSGI-INF/defaultCallbackHandler.xml | 0 .../OSGI-INF/homeRepository.xml | 0 .../OSGI-INF/userAdminWrapper.xml | 0 {eclipse => swt}/org.argeo.cms.e4/bnd.bnd | 0 .../org.argeo.cms.e4/build.properties | 0 .../org.argeo.cms.e4/e4xmi/cms-devops.e4xmi | 0 .../org.argeo.cms.e4/e4xmi/cms-ego.e4xmi | 0 .../src/org/argeo/cms/e4/CmsE4Utils.java | 0 .../cms/e4/OsgiFilterContextFunction.java | 0 .../src/org/argeo/cms/e4/PrivilegedJob.java | 0 .../org/argeo/cms/e4/addons/AuthAddon.java | 0 .../org/argeo/cms/e4/addons/LocaleAddon.java | 0 .../org/argeo/cms/e4/addons/package-info.java | 0 .../argeo/cms/e4/files/NodeFsBrowserView.java | 0 .../org/argeo/cms/e4/files/package-info.java | 0 .../argeo/cms/e4/handlers/ChangeLanguage.java | 0 .../argeo/cms/e4/handlers/ChangePassword.java | 0 .../argeo/cms/e4/handlers/CloseAllParts.java | 0 .../argeo/cms/e4/handlers/CloseWorkbench.java | 0 .../org/argeo/cms/e4/handlers/DoNothing.java | 0 .../e4/handlers/LanguageMenuContribution.java | 0 .../cms/e4/handlers/OpenPerspective.java | 0 .../argeo/cms/e4/handlers/SaveAllParts.java | 0 .../org/argeo/cms/e4/handlers/SavePart.java | 0 .../argeo/cms/e4/handlers/package-info.java | 0 .../argeo/cms/e4/jcr/EclipseJcrMonitor.java | 0 .../argeo/cms/e4/jcr/GenericPropertyPage.java | 0 .../org/argeo/cms/e4/jcr/JcrBrowserView.java | 0 .../argeo/cms/e4/jcr/JcrE4DClickListener.java | 0 .../org/argeo/cms/e4/jcr/JcrNodeEditor.java | 0 .../src/org/argeo/cms/e4/jcr/SimplePart.java | 0 .../cms/e4/jcr/handlers/AddFolderNode.java | 0 .../e4/jcr/handlers/AddRemoteRepository.java | 0 .../cms/e4/jcr/handlers/DeleteNodes.java | 0 .../argeo/cms/e4/jcr/handlers/Refresh.java | 0 .../argeo/cms/e4/jcr/handlers/RenameNode.java | 0 .../cms/e4/jcr/handlers/package-info.java | 0 .../org/argeo/cms/e4/jcr/package-info.java | 0 .../e4/maintenance/AbstractOsgiComposite.java | 0 .../org/argeo/cms/e4/maintenance/Browse.java | 0 .../maintenance/ConnectivityDeploymentUi.java | 0 .../cms/e4/maintenance/DataDeploymentUi.java | 0 .../e4/maintenance/DeploymentEntryPoint.java | 0 .../cms/e4/maintenance/LogDeploymentUi.java | 0 .../cms/e4/maintenance/MaintenanceStyles.java | 0 .../cms/e4/maintenance/NonAdminPage.java | 0 .../e4/maintenance/SecurityDeploymentUi.java | 0 .../cms/e4/maintenance/package-info.java | 0 .../argeo/cms/e4/monitoring/BundleNode.java | 0 .../argeo/cms/e4/monitoring/BundlesView.java | 0 .../cms/e4/monitoring/CmsSessionsView.java | 0 .../argeo/cms/e4/monitoring/ModulesView.java | 0 .../e4/monitoring/OsgiConfigurationsView.java | 0 .../cms/e4/monitoring/OsgiExplorerImages.java | 0 .../e4/monitoring/ServiceReferenceNode.java | 0 .../cms/e4/monitoring/StateLabelProvider.java | 0 .../argeo/cms/e4/monitoring/package-info.java | 0 .../src/org/argeo/cms/e4/package-info.java | 0 .../org/argeo/cms/e4/parts/EgoDashboard.java | 0 .../cms/e4/users/AbstractRoleEditor.java | 0 .../cms/e4/users/CmsWorkbenchStyles.java | 0 .../org/argeo/cms/e4/users/GroupEditor.java | 0 .../org/argeo/cms/e4/users/GroupsView.java | 0 .../cms/e4/users/SecurityAdminImages.java | 0 .../org/argeo/cms/e4/users/UiAdminUtils.java | 0 .../cms/e4/users/UiUserAdminListener.java | 0 .../argeo/cms/e4/users/UserAdminWrapper.java | 0 .../cms/e4/users/UserBatchUpdateWizard.java | 0 .../org/argeo/cms/e4/users/UserEditor.java | 0 .../users/UserTableDefaultDClickListener.java | 0 .../src/org/argeo/cms/e4/users/UsersView.java | 0 .../cms/e4/users/handlers/DeleteGroups.java | 0 .../cms/e4/users/handlers/DeleteUsers.java | 0 .../argeo/cms/e4/users/handlers/NewGroup.java | 0 .../argeo/cms/e4/users/handlers/NewUser.java | 0 .../cms/e4/users/handlers/package-info.java | 0 .../org/argeo/cms/e4/users/package-info.java | 0 .../cms/e4/users/providers/CommonNameLP.java | 0 .../cms/e4/users/providers/DomainNameLP.java | 0 .../argeo/cms/e4/users/providers/MailLP.java | 0 .../cms/e4/users/providers/RoleIconLP.java | 0 .../users/providers/UserAdminAbstractLP.java | 0 .../e4/users/providers/UserDragListener.java | 0 .../cms/e4/users/providers/UserFilter.java | 0 .../cms/e4/users/providers/UserNameLP.java | 0 .../cms/e4/users/providers/package-info.java | 0 {eclipse => swt}/org.argeo.cms.swt/.classpath | 0 {eclipse => swt}/org.argeo.cms.swt/.project | 0 .../org.argeo.cms.swt/META-INF/.gitignore | 0 .../org.argeo.cms.swt/OSGI-INF/cmsUserApp.xml | 0 {eclipse => swt}/org.argeo.cms.swt/bnd.bnd | 0 .../org.argeo.cms.swt/build.properties | 0 .../org.argeo.cms.swt/icons/actions/add.png | Bin .../icons/actions/close-all.png | Bin .../icons/actions/delete.png | Bin .../org.argeo.cms.swt/icons/actions/edit.png | Bin .../icons/actions/save-all.png | Bin .../org.argeo.cms.swt/icons/actions/save.png | Bin .../org.argeo.cms.swt/icons/active.gif | Bin .../org.argeo.cms.swt/icons/add.gif | Bin .../org.argeo.cms.swt/icons/add.png | Bin .../org.argeo.cms.swt/icons/addFolder.gif | Bin .../org.argeo.cms.swt/icons/addPrivileges.gif | Bin .../org.argeo.cms.swt/icons/addRepo.gif | Bin .../org.argeo.cms.swt/icons/addWorkspace.png | Bin .../org.argeo.cms.swt/icons/adminLog.gif | Bin .../org.argeo.cms.swt/icons/batch.gif | Bin .../org.argeo.cms.swt/icons/begin.gif | Bin .../org.argeo.cms.swt/icons/binary.png | Bin .../org.argeo.cms.swt/icons/browser.gif | Bin .../org.argeo.cms.swt/icons/bundles.gif | Bin .../icons/changePassword.gif | Bin .../org.argeo.cms.swt/icons/clear.gif | Bin .../org.argeo.cms.swt/icons/close-all.png | Bin .../org.argeo.cms.swt/icons/commit.gif | Bin .../org.argeo.cms.swt/icons/delete.png | Bin .../org.argeo.cms.swt/icons/dumpNode.gif | Bin .../org.argeo.cms.swt/icons/file.gif | Bin .../org.argeo.cms.swt/icons/folder.gif | Bin .../org.argeo.cms.swt/icons/getSize.gif | Bin .../org.argeo.cms.swt/icons/group.png | Bin .../org.argeo.cms.swt/icons/home.gif | Bin .../org.argeo.cms.swt/icons/home.png | Bin .../org.argeo.cms.swt/icons/import_fs.png | Bin .../org.argeo.cms.swt/icons/installed.gif | Bin .../org.argeo.cms.swt/icons/log.gif | Bin .../org.argeo.cms.swt/icons/logout.png | Bin .../org.argeo.cms.swt/icons/maintenance.gif | Bin .../org.argeo.cms.swt/icons/node.gif | Bin .../org.argeo.cms.swt/icons/nodes.gif | Bin .../org.argeo.cms.swt/icons/osgi_explorer.gif | Bin .../org.argeo.cms.swt/icons/password.gif | Bin .../icons/person-logged-in.png | Bin .../org.argeo.cms.swt/icons/person.png | Bin .../org.argeo.cms.swt/icons/query.png | Bin .../org.argeo.cms.swt/icons/refresh.png | Bin .../icons/remote_connected.gif | Bin .../icons/remote_disconnected.gif | Bin .../org.argeo.cms.swt/icons/remove.gif | Bin .../icons/removePrivileges.gif | Bin .../org.argeo.cms.swt/icons/rename.gif | Bin .../org.argeo.cms.swt/icons/repositories.gif | Bin .../icons/repository_connected.gif | Bin .../icons/repository_disconnected.gif | Bin .../org.argeo.cms.swt/icons/resolved.gif | Bin .../org.argeo.cms.swt/icons/role.gif | Bin .../org.argeo.cms.swt/icons/rollback.gif | Bin .../org.argeo.cms.swt/icons/save-all.png | Bin .../org.argeo.cms.swt/icons/save.gif | Bin .../org.argeo.cms.swt/icons/save.png | Bin .../org.argeo.cms.swt/icons/save_security.png | Bin .../icons/save_security_disabled.png | Bin .../org.argeo.cms.swt/icons/security.gif | Bin .../icons/service_published.gif | Bin .../icons/service_referenced.gif | Bin .../org.argeo.cms.swt/icons/sort.gif | Bin .../org.argeo.cms.swt/icons/starting.gif | Bin .../org.argeo.cms.swt/icons/sync.gif | Bin .../org.argeo.cms.swt/icons/user.gif | Bin .../org.argeo.cms.swt/icons/users.gif | Bin .../org.argeo.cms.swt/icons/workgroup.png | Bin .../org.argeo.cms.swt/icons/workgroup.xcf | Bin .../icons/workspace_connected.png | Bin .../icons/workspace_disconnected.png | Bin .../cms/jface/dialog/CmsWizardDialog.java | 0 .../src/org/argeo/cms/swt/CmsException.java | 0 .../src/org/argeo/cms/swt/CmsStyles.java | 0 .../src/org/argeo/cms/swt/CmsSwtTheme.java | 0 .../src/org/argeo/cms/swt/CmsSwtUi.java | 0 .../src/org/argeo/cms/swt/CmsSwtUtils.java | 0 .../org/argeo/cms/swt/MouseDoubleClick.java | 0 .../src/org/argeo/cms/swt/MouseDown.java | 0 .../src/org/argeo/cms/swt/Selected.java | 0 .../org/argeo/cms/swt/SimpleSwtUxContext.java | 0 .../org/argeo/cms/swt/SwtEditablePart.java | 0 .../argeo/cms/swt/acr/ContentComposite.java | 0 .../src/org/argeo/cms/swt/acr/SwtSection.java | 0 .../org/argeo/cms/swt/acr/SwtSectionPart.java | 0 .../org/argeo/cms/swt/acr/SwtTabbedArea.java | 0 .../org/argeo/cms/swt/acr/SwtUiProvider.java | 0 .../argeo/cms/swt/app/AcrContentTreeView.java | 0 .../src/org/argeo/cms/swt/app/CmsUserApp.java | 0 .../src/org/argeo/cms/swt/auth/CmsLogin.java | 0 .../org/argeo/cms/swt/auth/CmsLoginShell.java | 0 .../swt/auth/CompositeCallbackHandler.java | 0 .../cms/swt/auth/DynamicCallbackHandler.java | 0 .../org/argeo/cms/swt/auth/LocaleChoice.java | 0 .../org/argeo/cms/swt/auth/package-info.java | 0 .../cms/swt/dialogs/ChangePasswordDialog.java | 0 .../argeo/cms/swt/dialogs/CmsFeedback.java | 0 .../cms/swt/dialogs/CmsMessageDialog.java | 0 .../cms/swt/dialogs/LightweightDialog.java | 0 .../cms/swt/dialogs/SingleValueDialog.java | 0 .../argeo/cms/swt/dialogs/package-info.java | 0 .../argeo/cms/swt/osgi/BundleCmsSwtTheme.java | 0 .../argeo/cms/swt/osgi/BundleSvgTheme.java | 0 .../cms/swt/useradmin/PickUpUserDialog.java | 0 .../org/argeo/cms/swt/useradmin/UserLP.java | 0 .../argeo/cms/swt/useradmin/UsersImages.java | 0 .../argeo/cms/swt/useradmin/package-info.java | 0 .../cms/swt/widgets/AbstractSwtPart.java | 0 .../argeo/cms/swt/widgets/ContextOverlay.java | 0 .../argeo/cms/swt/widgets/EditableText.java | 0 .../argeo/cms/swt/widgets/ScrolledPage.java | 0 .../argeo/cms/swt/widgets/StyledControl.java | 0 .../cms/swt/widgets/SwtHierarchicalPart.java | 0 .../argeo/cms/swt/widgets/SwtTabularPart.java | 0 .../src/org/argeo/cms/ui/theme/CmsImages.java | 0 .../org/argeo/cms/ui/theme/package-info.java | 0 .../ui/AbstractTreeContentProvider.java | 0 .../argeo/eclipse/ui/ColumnDefinition.java | 0 .../eclipse/ui/ColumnViewerComparator.java | 0 .../argeo/eclipse/ui/EclipseUiException.java | 0 .../org/argeo/eclipse/ui/EclipseUiUtils.java | 0 .../org/argeo/eclipse/ui/FileProvider.java | 0 .../eclipse/ui/GenericTableComparator.java | 0 .../org/argeo/eclipse/ui/IListProvider.java | 0 .../eclipse/ui/dialogs/ErrorFeedback.java | 0 .../eclipse/ui/dialogs/FeedbackDialog.java | 0 .../eclipse/ui/dialogs/LightweightDialog.java | 0 .../argeo/eclipse/ui/dialogs/SingleValue.java | 0 .../eclipse/ui/dialogs/package-info.java | 0 .../eclipse/ui/fs/AdvancedFsBrowser.java | 0 .../ui/fs/FileIconNameLabelProvider.java | 0 .../argeo/eclipse/ui/fs/FsTableViewer.java | 0 .../org/argeo/eclipse/ui/fs/FsTreeViewer.java | 0 .../argeo/eclipse/ui/fs/FsUiConstants.java | 0 .../argeo/eclipse/ui/fs/FsUiException.java | 0 .../org/argeo/eclipse/ui/fs/FsUiUtils.java | 0 .../eclipse/ui/fs/NioFileLabelProvider.java | 0 .../org/argeo/eclipse/ui/fs/ParentDir.java | 0 .../argeo/eclipse/ui/fs/SimpleFsBrowser.java | 0 .../eclipse/ui/fs/SimpleFsTreeBrowser.java | 0 .../src/org/argeo/eclipse/ui/fs/file.png | Bin .../src/org/argeo/eclipse/ui/fs/folder.png | Bin .../org/argeo/eclipse/ui/fs/package-info.java | 0 .../org/argeo/eclipse/ui/package-info.java | 0 .../eclipse/ui/parts/LdifUsersTable.java | 0 .../argeo/eclipse/ui/parts/package-info.java | 0 .../argeo/eclipse/ui/util/ViewerUtils.java | 0 .../argeo/eclipse/ui/util/package-info.java | 0 .../rap}/org.argeo.cms.e4.rap/.classpath | 0 .../rap}/org.argeo.cms.e4.rap/.project | 0 .../org.argeo.cms.e4.rap/META-INF/.gitignore | 0 .../OSGI-INF/cms-admin-rap.xml | 0 {rap => swt/rap}/org.argeo.cms.e4.rap/bnd.bnd | 0 .../org.argeo.cms.e4.rap/build.properties | 0 .../argeo/cms/e4/rap/AbstractRapE4App.java | 0 .../org/argeo/cms/e4/rap/CmsE4AdminApp.java | 0 .../cms/e4/rap/CmsE4EntryPointFactory.java | 0 .../argeo/cms/e4/rap/CmsLoginLifecycle.java | 0 .../org/argeo/cms/e4/rap/SimpleRapE4App.java | 0 .../org/argeo/cms/e4/rap/package-info.java | 0 swt/rap/org.argeo.cms.swt.rap.cli/.classpath | 7 + swt/rap/org.argeo.cms.swt.rap.cli/.project | 28 ++++ .../rap/org.argeo.cms.swt.rap.cli}/bnd.bnd | 14 +- .../build.properties | 4 + .../org/argeo/cms/swt/rap/cli/CmsRapCli.java | 123 ++++++++++++++++++ .../org/argeo/cms/swt/rap/cli}/RwtRunner.java | 57 ++++---- .../rap/org.argeo.cms.swt.rap}/.classpath | 0 .../rap/org.argeo.cms.swt.rap}/.project | 0 .../META-INF/.gitignore | 0 .../OSGI-INF/cmsWebAppFactory.xml | 0 swt/rap/org.argeo.cms.swt.rap/bnd.bnd | 12 ++ .../org.argeo.cms.swt.rap}/build.properties | 0 .../src/org/argeo/cms/ui/script/AppUi.java | 0 .../src/org/argeo/cms/ui/script/Branding.java | 0 .../org/argeo/cms/ui/script/CmsScriptApp.java | 0 .../ui/script/CmsScriptRwtApplication.java | 0 .../cms/ui/script/ScriptAppActivator.java | 0 .../src/org/argeo/cms/ui/script/ScriptUi.java | 0 .../src/org/argeo/cms/ui/script/cms.js | 0 .../org/argeo/cms/ui/script/package-info.java | 0 .../argeo/cms/web/AbstractCmsEntryPoint.java | 0 .../argeo/cms/web/BundleResourceLoader.java | 0 .../argeo/cms/web/CmsThemeResourceLoader.java | 0 .../src/org/argeo/cms/web/CmsWebApp.java | 6 +- .../org/argeo/cms/web/CmsWebEntryPoint.java | 0 .../src/org/argeo/cms/web/MinimalWebApp.java | 0 .../src/org/argeo/cms/web/SimpleApp.java | 0 .../org/argeo/cms/web/SimpleErgonomics.java | 0 .../src/org/argeo/cms/web/WebThemeUtils.java | 0 .../argeo/cms/web/osgi/CmsWebAppFactory.java | 2 +- .../org.argeo.swt.specific.rap/.classpath | 0 .../rap}/org.argeo.swt.specific.rap/.project | 0 .../META-INF/.gitignore | 0 .../rap}/org.argeo.swt.specific.rap/bnd.bnd | 0 .../build.properties | 0 .../ui/specific/BufferedImageDisplay.java | 0 .../eclipse/ui/specific/CmsFileDialog.java | 0 .../eclipse/ui/specific/CmsFileUpload.java | 0 .../ui/specific/EclipseUiSpecificUtils.java | 0 .../eclipse/ui/specific/FileDropAdapter.java | 0 .../argeo/eclipse/ui/specific/UiContext.java | 0 .../eclipse/ui/specific/package-info.java | 0 .../rcp}/org.argeo.cms.e4.rcp/.classpath | 0 .../rcp}/org.argeo.cms.e4.rcp/.gitignore | 0 .../rcp}/org.argeo.cms.e4.rcp/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../org.argeo.cms.e4.rcp/META-INF/.gitignore | 0 .../argeo-companion.e4xmi | 0 .../argeo-companion.properties | 0 {rcp => swt/rcp}/org.argeo.cms.e4.rcp/bnd.bnd | 0 .../org.argeo.cms.e4.rcp/build.properties | 0 .../org.argeo.cms.e4.rcp/log4j.properties | 0 .../rcp}/org.argeo.cms.e4.rcp/plugin.xml | 0 .../argeo/cms/e4/rcp/CmsE4Application.java | 0 .../org/argeo/cms/e4/rcp/CmsRcpLifeCycle.java | 0 swt/rcp/org.argeo.cms.swt.rcp.cli/.classpath | 7 + swt/rcp/org.argeo.cms.swt.rcp.cli/.project | 28 ++++ swt/rcp/org.argeo.cms.swt.rcp.cli/bnd.bnd | 0 .../build.properties | 4 + .../src/org/argeo/cms/swt/rcp/cli/CmsCli.java | 110 ++++++++++++++++ .../rcp/org.argeo.cms.swt.rcp}/.classpath | 0 .../rcp/org.argeo.cms.swt.rcp}/.gitignore | 0 .../rcp/org.argeo.cms.swt.rcp}/.project | 0 .../META-INF/.gitignore | 0 .../OSGI-INF/cmsRcpDisplayFactory.xml | 0 .../OSGI-INF/cmsRcpServletFactory.xml | 0 .../rcp/org.argeo.cms.swt.rcp}/bnd.bnd | 0 .../org.argeo.cms.swt.rcp}/build.properties | 0 .../src/org/argeo/cms/ui/rcp/CmsRcpApp.java | 0 .../cms/ui/rcp/CmsRcpDisplayFactory.java | 0 .../cms/ui/rcp/servlet/CmsRcpServlet.java | 0 .../ui/rcp/servlet/CmsRcpServletFactory.java | 0 .../org.argeo.swt.specific.rcp/.classpath | 0 .../org.argeo.swt.specific.rcp/.gitignore | 0 .../rcp}/org.argeo.swt.specific.rcp/.project | 0 .../META-INF/.gitignore | 0 .../rcp}/org.argeo.swt.specific.rcp/bnd.bnd | 0 .../build.properties | 0 .../ui/rcp/internal/rwt/RcpClient.java | 0 .../rcp/internal/rwt/RcpResourceManager.java | 0 .../ui/specific/BufferedImageDisplay.java | 0 .../eclipse/ui/specific/CmsFileDialog.java | 0 .../eclipse/ui/specific/CmsFileUpload.java | 0 .../argeo/eclipse/ui/specific/DefaultNLS.java | 0 .../ui/specific/EclipseUiConstants.java | 0 .../ui/specific/EclipseUiSpecificUtils.java | 0 .../eclipse/ui/specific/FileDropAdapter.java | 0 .../argeo/eclipse/ui/specific/UiContext.java | 0 .../eclipse/rap/fileupload/FileDetails.java | 0 .../rap/fileupload/FileUploadEvent.java | 0 .../rap/fileupload/FileUploadHandler.java | 0 .../rap/fileupload/FileUploadListener.java | 0 .../rap/fileupload/FileUploadReceiver.java | 0 .../src/org/eclipse/rap/rwt/RWT.java | 0 .../org/eclipse/rap/rwt/SingletonUtil.java | 0 .../rwt/application/AbstractEntryPoint.java | 0 .../rap/rwt/application/Application.java | 0 .../application/ApplicationConfiguration.java | 0 .../rap/rwt/application/EntryPoint.java | 0 .../rwt/application/EntryPointFactory.java | 0 .../rap/rwt/application/ExceptionHandler.java | 0 .../org/eclipse/rap/rwt/client/Client.java | 0 .../org/eclipse/rap/rwt/client/WebClient.java | 0 .../rwt/client/service/BrowserNavigation.java | 0 .../service/BrowserNavigationEvent.java | 0 .../service/BrowserNavigationListener.java | 0 .../rap/rwt/client/service/ClientService.java | 0 .../client/service/JavaScriptExecutor.java | 0 .../rap/rwt/client/service/UrlLauncher.java | 0 .../rap/rwt/service/ResourceLoader.java | 0 .../rap/rwt/service/ResourceManager.java | 0 .../rap/rwt/service/ServerPushSession.java | 0 .../org/eclipse/rap/rwt/widgets/DropDown.java | 0 .../eclipse/rap/rwt/widgets/FileUpload.java | 0 391 files changed, 600 insertions(+), 72 deletions(-) create mode 100644 org.argeo.api.cli/.classpath create mode 100644 org.argeo.api.cli/.project create mode 100644 org.argeo.api.cli/bnd.bnd create mode 100644 org.argeo.api.cli/build.properties rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.cli/src/org/argeo/api}/cli/CommandArgsException.java (96%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.cli/src/org/argeo/api}/cli/CommandRuntimeException.java (97%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.cli/src/org/argeo/api}/cli/CommandsCli.java (99%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.cli/src/org/argeo/api}/cli/DescribedCommand.java (98%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.cli/src/org/argeo/api}/cli/HelpCommand.java (99%) create mode 100644 org.argeo.api.cli/src/org/argeo/api/cli/package-info.java create mode 100644 org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshCli.java create mode 100644 org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshShell.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/cli/package-info.java rename {eclipse => swt}/org.argeo.cms.e4/.classpath (100%) rename {eclipse => swt}/org.argeo.cms.e4/.project (100%) rename {eclipse => swt}/org.argeo.cms.e4/META-INF/.gitignore (100%) rename {eclipse => swt}/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml (100%) rename {eclipse => swt}/org.argeo.cms.e4/OSGI-INF/homeRepository.xml (100%) rename {eclipse => swt}/org.argeo.cms.e4/OSGI-INF/userAdminWrapper.xml (100%) rename {eclipse => swt}/org.argeo.cms.e4/bnd.bnd (100%) rename {eclipse => swt}/org.argeo.cms.e4/build.properties (100%) rename {eclipse => swt}/org.argeo.cms.e4/e4xmi/cms-devops.e4xmi (100%) rename {eclipse => swt}/org.argeo.cms.e4/e4xmi/cms-ego.e4xmi (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/CmsE4Utils.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/PrivilegedJob.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/files/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangeLanguage.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseAllParts.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/DoNothing.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LanguageMenuContribution.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SaveAllParts.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SavePart.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/GenericPropertyPage.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrE4DClickListener.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/SimplePart.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiExplorerImages.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/StateLabelProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/CmsWorkbenchStyles.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/SecurityAdminImages.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiUserAdminListener.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/DomainNameLP.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/MailLP.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserAdminAbstractLP.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserDragListener.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserNameLP.java (100%) rename {eclipse => swt}/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/.classpath (100%) rename {eclipse => swt}/org.argeo.cms.swt/.project (100%) rename {eclipse => swt}/org.argeo.cms.swt/META-INF/.gitignore (100%) rename {eclipse => swt}/org.argeo.cms.swt/OSGI-INF/cmsUserApp.xml (100%) rename {eclipse => swt}/org.argeo.cms.swt/bnd.bnd (100%) rename {eclipse => swt}/org.argeo.cms.swt/build.properties (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/actions/add.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/actions/close-all.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/actions/delete.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/actions/edit.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/actions/save-all.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/actions/save.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/active.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/add.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/add.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/addFolder.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/addPrivileges.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/addRepo.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/addWorkspace.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/adminLog.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/batch.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/begin.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/binary.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/browser.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/bundles.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/changePassword.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/clear.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/close-all.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/commit.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/delete.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/dumpNode.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/file.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/folder.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/getSize.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/group.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/home.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/home.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/import_fs.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/installed.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/log.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/logout.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/maintenance.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/node.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/nodes.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/osgi_explorer.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/password.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/person-logged-in.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/person.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/query.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/refresh.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/remote_connected.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/remote_disconnected.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/remove.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/removePrivileges.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/rename.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/repositories.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/repository_connected.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/repository_disconnected.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/resolved.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/role.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/rollback.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/save-all.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/save.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/save.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/save_security.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/save_security_disabled.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/security.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/service_published.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/service_referenced.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/sort.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/starting.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/sync.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/user.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/users.gif (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/workgroup.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/workgroup.xcf (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/workspace_connected.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/icons/workspace_disconnected.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/jface/dialog/CmsWizardDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsException.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsStyles.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDoubleClick.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDown.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/Selected.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtUiProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/app/AcrContentTreeView.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CompositeCallbackHandler.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/DynamicCallbackHandler.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/LocaleChoice.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsFeedback.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsMessageDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/LightweightDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/SingleValueDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UserLP.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UsersImages.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/AbstractSwtPart.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ContextOverlay.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/EditableText.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/StyledControl.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtHierarchicalPart.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabularPart.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java (100%) rename {eclipse => swt}/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/.classpath (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/.project (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/META-INF/.gitignore (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/bnd.bnd (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/build.properties (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java (100%) rename {rap => swt/rap}/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java (100%) create mode 100644 swt/rap/org.argeo.cms.swt.rap.cli/.classpath create mode 100644 swt/rap/org.argeo.cms.swt.rap.cli/.project rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap.cli}/bnd.bnd (63%) create mode 100644 swt/rap/org.argeo.cms.swt.rap.cli/build.properties create mode 100644 swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/CmsRapCli.java rename {rap/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty => swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli}/RwtRunner.java (72%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/.classpath (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/.project (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/META-INF/.gitignore (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/OSGI-INF/cmsWebAppFactory.xml (100%) create mode 100644 swt/rap/org.argeo.cms.swt.rap/bnd.bnd rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/build.properties (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/AppUi.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/Branding.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/CmsScriptApp.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/ScriptAppActivator.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/ScriptUi.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/cms.js (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/ui/script/package-info.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/AbstractCmsEntryPoint.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/BundleResourceLoader.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/CmsThemeResourceLoader.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/CmsWebApp.java (97%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/CmsWebEntryPoint.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/MinimalWebApp.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/SimpleApp.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/SimpleErgonomics.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/WebThemeUtils.java (100%) rename {rap/org.argeo.cms.ui.rap => swt/rap/org.argeo.cms.swt.rap}/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java (97%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/.classpath (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/.project (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/META-INF/.gitignore (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/bnd.bnd (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/build.properties (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java (100%) rename {rap => swt/rap}/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/.classpath (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/.gitignore (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/.project (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/.settings/org.eclipse.jdt.core.prefs (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/.settings/org.eclipse.pde.core.prefs (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/META-INF/.gitignore (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/argeo-companion.e4xmi (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/argeo-companion.properties (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/bnd.bnd (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/build.properties (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/log4j.properties (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/plugin.xml (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java (100%) rename {rcp => swt/rcp}/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsRcpLifeCycle.java (100%) create mode 100644 swt/rcp/org.argeo.cms.swt.rcp.cli/.classpath create mode 100644 swt/rcp/org.argeo.cms.swt.rcp.cli/.project create mode 100644 swt/rcp/org.argeo.cms.swt.rcp.cli/bnd.bnd create mode 100644 swt/rcp/org.argeo.cms.swt.rcp.cli/build.properties create mode 100644 swt/rcp/org.argeo.cms.swt.rcp.cli/src/org/argeo/cms/swt/rcp/cli/CmsCli.java rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/.classpath (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/.gitignore (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/.project (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/META-INF/.gitignore (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/OSGI-INF/cmsRcpDisplayFactory.xml (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/OSGI-INF/cmsRcpServletFactory.xml (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/bnd.bnd (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/build.properties (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/src/org/argeo/cms/ui/rcp/CmsRcpApp.java (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java (100%) rename {rcp/org.argeo.cms.ui.rcp => swt/rcp/org.argeo.cms.swt.rcp}/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/.classpath (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/.gitignore (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/.project (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/META-INF/.gitignore (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/bnd.bnd (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/build.properties (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpClient.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiConstants.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/UiContext.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileDetails.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadEvent.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadHandler.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadListener.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadReceiver.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/RWT.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/SingletonUtil.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/AbstractEntryPoint.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/Application.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ApplicationConfiguration.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPoint.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPointFactory.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ExceptionHandler.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/Client.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/WebClient.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigation.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationEvent.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationListener.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/ClientService.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/JavaScriptExecutor.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/UrlLauncher.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceLoader.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceManager.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ServerPushSession.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/DropDown.java (100%) rename {rcp => swt/rcp}/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java (100%) diff --git a/Makefile b/Makefile index 8688ce849..ee0604630 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ org.argeo.init \ org.argeo.util \ org.argeo.api.uuid \ org.argeo.api.acr \ +org.argeo.api.cli \ org.argeo.api.cms \ org.argeo.cms \ org.argeo.cms.sql \ @@ -23,11 +24,12 @@ org.argeo.cms.ssh \ org.argeo.cms.ux \ eclipse/org.argeo.ext.equinox.jetty \ eclipse/org.argeo.cms.servlet \ -eclipse/org.argeo.cms.swt \ -eclipse/org.argeo.cms.e4 \ -rap/org.argeo.cms.ui.rap \ -rap/org.argeo.swt.specific.rap \ -rap/org.argeo.cms.e4.rap \ +swt/org.argeo.cms.swt \ +swt/org.argeo.cms.e4 \ +swt/rap/org.argeo.swt.specific.rap \ +swt/rap/org.argeo.cms.swt.rap \ +swt/rap/org.argeo.cms.swt.rap.cli \ +swt/rap/org.argeo.cms.e4.rap \ jcr/org.argeo.cms.jcr \ jcr/org.argeo.cms.ui \ @@ -44,7 +46,7 @@ org.argeo.api.cms A2_OUTPUT = $(SDK_BUILD_BASE)/a2 A2_BASE = $(A2_OUTPUT) -VPATH = .:eclipse:rap:jcr +VPATH = .:eclipse:rap:jcr:swt:swt/rap DEP_CATEGORIES = \ org.argeo.tp \ @@ -64,4 +66,16 @@ clean: $(MAKE) -C jni clean $(MAKE) -f Makefile-rcp.mk clean +A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES))) + +native-image: + mkdir -p $(A2_OUTPUT)/libexec/$(A2_CATEGORY) + cd $(A2_OUTPUT)/libexec/$(A2_CATEGORY) && /opt/graalvm-ce/bin/native-image \ + -cp $(A2_CLASSPATH):$(A2_BUNDLES_CLASSPATH) org.argeo.eclipse.ui.jetty.CmsRapCli \ + --enable-url-protocols=http,https \ + -H:AdditionalSecurityProviders=sun.security.jgss.SunProvider,org.bouncycastle.jce.provider.BouncyCastleProvider,net.i2p.crypto.eddsa.EdDSASecurityProvider \ + --initialize-at-build-time=org.argeo.init.logging.ThinLogging,org.slf4j.LoggerFactory \ + --no-fallback + + include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk index 02ca52962..8b96683fc 100644 --- a/Makefile-rcp.mk +++ b/Makefile-rcp.mk @@ -6,10 +6,11 @@ all: osgi A2_CATEGORY = org.argeo.cms.eclipse.rcp BUNDLES = \ -rcp/org.argeo.cms.e4.rcp \ -rcp/org.argeo.cms.ui.rcp \ rcp/org.argeo.swt.minidesktop \ -rcp/org.argeo.swt.specific.rcp \ +swt/rcp/org.argeo.swt.specific.rcp \ +swt/rcp/org.argeo.cms.swt.rcp \ +swt/rcp/org.argeo.cms.swt.rcp.cli \ +swt/rcp/org.argeo.cms.e4.rcp \ A2_OUTPUT = $(SDK_BUILD_BASE)/a2 A2_BASE = $(A2_OUTPUT) @@ -30,6 +31,6 @@ org.argeo.tp.jcr clean: rm -rf $(BUILD_BASE) -VPATH = .:rcp +VPATH = .:rcp:swt/rcp include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file diff --git a/org.argeo.api.cli/.classpath b/org.argeo.api.cli/.classpath new file mode 100644 index 000000000..81fe078c2 --- /dev/null +++ b/org.argeo.api.cli/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.api.cli/.project b/org.argeo.api.cli/.project new file mode 100644 index 000000000..8f5cd419b --- /dev/null +++ b/org.argeo.api.cli/.project @@ -0,0 +1,28 @@ + + + org.argeo.api.cli + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.argeo.api.cli/bnd.bnd b/org.argeo.api.cli/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/org.argeo.api.cli/build.properties b/org.argeo.api.cli/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/org.argeo.api.cli/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.argeo.cms/src/org/argeo/cms/cli/CommandArgsException.java b/org.argeo.api.cli/src/org/argeo/api/cli/CommandArgsException.java similarity index 96% rename from org.argeo.cms/src/org/argeo/cms/cli/CommandArgsException.java rename to org.argeo.api.cli/src/org/argeo/api/cli/CommandArgsException.java index 1f6d56bb1..b2a12a603 100644 --- a/org.argeo.cms/src/org/argeo/cms/cli/CommandArgsException.java +++ b/org.argeo.api.cli/src/org/argeo/api/cli/CommandArgsException.java @@ -1,4 +1,4 @@ -package org.argeo.cms.cli; +package org.argeo.api.cli; public class CommandArgsException extends IllegalArgumentException { private static final long serialVersionUID = -7271050747105253935L; diff --git a/org.argeo.cms/src/org/argeo/cms/cli/CommandRuntimeException.java b/org.argeo.api.cli/src/org/argeo/api/cli/CommandRuntimeException.java similarity index 97% rename from org.argeo.cms/src/org/argeo/cms/cli/CommandRuntimeException.java rename to org.argeo.api.cli/src/org/argeo/api/cli/CommandRuntimeException.java index ef27c1fc8..52c033433 100644 --- a/org.argeo.cms/src/org/argeo/cms/cli/CommandRuntimeException.java +++ b/org.argeo.api.cli/src/org/argeo/api/cli/CommandRuntimeException.java @@ -1,4 +1,4 @@ -package org.argeo.cms.cli; +package org.argeo.api.cli; import java.util.List; diff --git a/org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java b/org.argeo.api.cli/src/org/argeo/api/cli/CommandsCli.java similarity index 99% rename from org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java rename to org.argeo.api.cli/src/org/argeo/api/cli/CommandsCli.java index b9d262dee..b82308a2b 100644 --- a/org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java +++ b/org.argeo.api.cli/src/org/argeo/api/cli/CommandsCli.java @@ -1,4 +1,4 @@ -package org.argeo.cms.cli; +package org.argeo.api.cli; import java.io.StringWriter; import java.util.ArrayList; diff --git a/org.argeo.cms/src/org/argeo/cms/cli/DescribedCommand.java b/org.argeo.api.cli/src/org/argeo/api/cli/DescribedCommand.java similarity index 98% rename from org.argeo.cms/src/org/argeo/cms/cli/DescribedCommand.java rename to org.argeo.api.cli/src/org/argeo/api/cli/DescribedCommand.java index cdfe1300d..7a9d5d901 100644 --- a/org.argeo.cms/src/org/argeo/cms/cli/DescribedCommand.java +++ b/org.argeo.api.cli/src/org/argeo/api/cli/DescribedCommand.java @@ -1,4 +1,4 @@ -package org.argeo.cms.cli; +package org.argeo.api.cli; import java.io.StringWriter; import java.util.Arrays; diff --git a/org.argeo.cms/src/org/argeo/cms/cli/HelpCommand.java b/org.argeo.api.cli/src/org/argeo/api/cli/HelpCommand.java similarity index 99% rename from org.argeo.cms/src/org/argeo/cms/cli/HelpCommand.java rename to org.argeo.api.cli/src/org/argeo/api/cli/HelpCommand.java index ab899f437..d5285a60c 100644 --- a/org.argeo.cms/src/org/argeo/cms/cli/HelpCommand.java +++ b/org.argeo.api.cli/src/org/argeo/api/cli/HelpCommand.java @@ -1,4 +1,4 @@ -package org.argeo.cms.cli; +package org.argeo.api.cli; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/org.argeo.api.cli/src/org/argeo/api/cli/package-info.java b/org.argeo.api.cli/src/org/argeo/api/cli/package-info.java new file mode 100644 index 000000000..114fd02d4 --- /dev/null +++ b/org.argeo.api.cli/src/org/argeo/api/cli/package-info.java @@ -0,0 +1,2 @@ +/** Command line API. */ +package org.argeo.api.cli; \ No newline at end of file diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshCli.java b/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshCli.java new file mode 100644 index 000000000..12b4d5e1d --- /dev/null +++ b/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshCli.java @@ -0,0 +1,17 @@ +package org.argeo.cms.ssh.cli; + +import org.argeo.api.cli.CommandsCli; + +public class SshCli extends CommandsCli { + public SshCli(String commandName) { + super(commandName); + addCommand("shell", new SshShell()); + } + + @Override + public String getDescription() { + return "SSH utilities."; + } + + +} diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshShell.java b/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshShell.java new file mode 100644 index 000000000..78903a779 --- /dev/null +++ b/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshShell.java @@ -0,0 +1,115 @@ +package org.argeo.cms.ssh.cli; + +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.net.URI; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.util.List; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.sshd.agent.SshAgent; +import org.apache.sshd.agent.SshAgentFactory; +import org.apache.sshd.agent.local.LocalAgentFactory; +import org.apache.sshd.agent.unix.UnixAgentFactory; +import org.apache.sshd.client.config.keys.ClientIdentityLoader; +import org.apache.sshd.common.NamedResource; +import org.apache.sshd.common.config.keys.FilePasswordProvider; +import org.argeo.api.cli.DescribedCommand; +import org.argeo.cms.ssh.AbstractSsh; +import org.argeo.cms.ssh.Ssh; + +public class SshShell implements DescribedCommand { + private Option portOption; + + @Override + public Options getOptions() { + Options options = new Options(); + portOption = Option.builder().option("p").longOpt("port").hasArg().desc("port to connect to").build(); + options.addOption(portOption); + return options; + } + + @Override + public String apply(List args) { + CommandLine cl = toCommandLine(args); + String portStr = cl.getOptionValue(portOption); + if (portStr == null) + portStr = "22"; + + String host = cl.getArgList().get(0); + + String uriStr = "ssh://" + host + ":" + portStr + "/"; + // System.out.println(uriStr); + URI uri = URI.create(uriStr); + + Ssh ssh = null; + try { + ssh = new Ssh(uri); + boolean osAgent; + SshAgent sshAgent; + try { + String sshAuthSockentEnv = System.getenv(SshAgent.SSH_AUTHSOCKET_ENV_NAME); + if (sshAuthSockentEnv != null) { + ssh.getSshClient().getProperties().put(SshAgent.SSH_AUTHSOCKET_ENV_NAME, sshAuthSockentEnv); + SshAgentFactory agentFactory = new UnixAgentFactory(); + ssh.getSshClient().setAgentFactory(agentFactory); + sshAgent = agentFactory.createClient(null, ssh.getSshClient()); + osAgent = true; + } else { + osAgent = false; + } + } catch (Exception e) { + e.printStackTrace(); + osAgent = false; + } + + if (!osAgent) { + SshAgentFactory agentFactory = new LocalAgentFactory(); + ssh.getSshClient().setAgentFactory(agentFactory); + sshAgent = agentFactory.createClient(null, ssh.getSshClient()); + String keyPath = System.getProperty("user.home") + "/.ssh/id_rsa"; + + char[] keyPassword = AbstractSsh.readPassword(); + NamedResource namedResource = new NamedResource() { + + @Override + public String getName() { + return keyPath; + } + }; + KeyPair keyPair = ClientIdentityLoader.DEFAULT + .loadClientIdentities(null, namedResource, FilePasswordProvider.of(new String(keyPassword))) + .iterator().next(); + sshAgent.addIdentity(keyPair, "NO COMMENT"); + } + +// char[] keyPassword = AbstractSsh.readPassword(); +// SshKeyPair keyPair = SshKeyPair.loadDefault(keyPassword); +// Arrays.fill(keyPassword, '*'); +// ssh.setSshKeyPair(keyPair); +// ssh.authenticate(); + ssh.verifyAuth(); + + long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); + System.out.println("Ssh available in " + jvmUptime + " ms."); + + AbstractSsh.openShell(ssh); + } catch (IOException | GeneralSecurityException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } finally { + if (ssh != null) + ssh.closeSession(); + } + return null; + } + + @Override + public String getDescription() { + return "Launch a static CMS."; + } + + } \ No newline at end of file diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java index 230a831a9..397caea34 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java @@ -9,8 +9,8 @@ import java.util.List; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; -import org.argeo.cms.cli.CommandArgsException; -import org.argeo.cms.cli.DescribedCommand; +import org.argeo.api.cli.CommandArgsException; +import org.argeo.api.cli.DescribedCommand; public class FileSync implements DescribedCommand> { final static Option deleteOption = Option.builder().longOpt("delete").desc("delete from target").build(); diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java index 2aa240633..088c1c352 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java @@ -1,6 +1,6 @@ package org.argeo.cms.acr.fs; -import org.argeo.cms.cli.CommandsCli; +import org.argeo.api.cli.CommandsCli; /** File utilities. */ public class FsCommands extends CommandsCli { diff --git a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java index de3a30270..82873ad01 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java @@ -9,8 +9,7 @@ import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; import org.argeo.api.cms.CmsLog; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; +import org.argeo.cms.internal.runtime.CmsContextImpl; import org.osgi.service.useradmin.Authorization; import org.osgi.service.useradmin.UserAdmin; @@ -22,7 +21,7 @@ public class AnonymousLoginModule implements LoginModule { private Map sharedState = null; // private state - private BundleContext bc; +// private BundleContext bc; @SuppressWarnings("unchecked") @Override @@ -30,12 +29,12 @@ public class AnonymousLoginModule implements LoginModule { Map options) { this.subject = subject; this.sharedState = (Map) sharedState; - try { - bc = FrameworkUtil.getBundle(AnonymousLoginModule.class).getBundleContext(); - assert bc != null; - } catch (Exception e) { - throw new IllegalStateException("Cannot initialize login module", e); - } +// try { +// bc = FrameworkUtil.getBundle(AnonymousLoginModule.class).getBundleContext(); +// assert bc != null; +// } catch (Exception e) { +// throw new IllegalStateException("Cannot initialize login module", e); +// } } @Override @@ -45,7 +44,7 @@ public class AnonymousLoginModule implements LoginModule { @Override public boolean commit() throws LoginException { - UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class)); + UserAdmin userAdmin = CmsContextImpl.getCmsContext().getUserAdmin(); Authorization authorization = userAdmin.getAuthorization(null); RemoteAuthRequest request = (RemoteAuthRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST); Locale locale = Locale.getDefault(); diff --git a/org.argeo.cms/src/org/argeo/cms/cli/package-info.java b/org.argeo.cms/src/org/argeo/cms/cli/package-info.java deleted file mode 100644 index 59feed1d1..000000000 --- a/org.argeo.cms/src/org/argeo/cms/cli/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Command line API. */ -package org.argeo.cms.cli; \ No newline at end of file diff --git a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java index f133d3049..d1a19bd63 100644 --- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java +++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java @@ -19,6 +19,7 @@ import org.argeo.cms.internal.runtime.CmsStateImpl; import org.argeo.cms.internal.runtime.CmsUserAdmin; import org.argeo.cms.internal.runtime.DeployedContentRepository; import org.argeo.util.register.Component; +import org.argeo.util.register.ComponentRegister; import org.argeo.util.register.SimpleRegister; import org.argeo.util.transaction.SimpleTransactionManager; import org.argeo.util.transaction.WorkControl; @@ -26,7 +27,7 @@ import org.argeo.util.transaction.WorkTransaction; import org.osgi.service.useradmin.UserAdmin; /** - * A CMS assembly which is programatically defined, as an alternative to OSGi + * A CMS assembly which is programmatically defined, as an alternative to OSGi * deployment. Useful for testing or AOT compilation. */ public class StaticCms { @@ -139,14 +140,18 @@ public class StaticCms { postActivation(register); } - protected void addComponents(SimpleRegister register) { + protected void addComponents(ComponentRegister register) { } - protected void postActivation(SimpleRegister register) { + protected void postActivation(ComponentRegister register) { } + public ComponentRegister getComponentRegister() { + return register; + } + public void stop() { if (register.isActive()) { register.deactivate(); diff --git a/org.argeo.util/src/org/argeo/util/register/ComponentRegister.java b/org.argeo.util/src/org/argeo/util/register/ComponentRegister.java index d5f9ea421..d78b6badb 100644 --- a/org.argeo.util/src/org/argeo/util/register/ComponentRegister.java +++ b/org.argeo.util/src/org/argeo/util/register/ComponentRegister.java @@ -10,6 +10,20 @@ public interface ComponentRegister { SortedSet> find(Class clss, Predicate> filter); + default Component.PublishedType getSingleton(Class type) { + SortedSet> found = find(type, null); + if (found.size() == 0) + throw new IllegalStateException("No component found for " + type); + return found.first().getType(type); + } + + default T getObject(Class clss) { + SortedSet> found = find(clss, null); + if (found.size() == 0) + return null; + return found.first().get(); + } + Component get(Object instance); // default PublishedType getType(Class clss) { diff --git a/eclipse/org.argeo.cms.e4/.classpath b/swt/org.argeo.cms.e4/.classpath similarity index 100% rename from eclipse/org.argeo.cms.e4/.classpath rename to swt/org.argeo.cms.e4/.classpath diff --git a/eclipse/org.argeo.cms.e4/.project b/swt/org.argeo.cms.e4/.project similarity index 100% rename from eclipse/org.argeo.cms.e4/.project rename to swt/org.argeo.cms.e4/.project diff --git a/eclipse/org.argeo.cms.e4/META-INF/.gitignore b/swt/org.argeo.cms.e4/META-INF/.gitignore similarity index 100% rename from eclipse/org.argeo.cms.e4/META-INF/.gitignore rename to swt/org.argeo.cms.e4/META-INF/.gitignore diff --git a/eclipse/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml b/swt/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml similarity index 100% rename from eclipse/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml rename to swt/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml diff --git a/eclipse/org.argeo.cms.e4/OSGI-INF/homeRepository.xml b/swt/org.argeo.cms.e4/OSGI-INF/homeRepository.xml similarity index 100% rename from eclipse/org.argeo.cms.e4/OSGI-INF/homeRepository.xml rename to swt/org.argeo.cms.e4/OSGI-INF/homeRepository.xml diff --git a/eclipse/org.argeo.cms.e4/OSGI-INF/userAdminWrapper.xml b/swt/org.argeo.cms.e4/OSGI-INF/userAdminWrapper.xml similarity index 100% rename from eclipse/org.argeo.cms.e4/OSGI-INF/userAdminWrapper.xml rename to swt/org.argeo.cms.e4/OSGI-INF/userAdminWrapper.xml diff --git a/eclipse/org.argeo.cms.e4/bnd.bnd b/swt/org.argeo.cms.e4/bnd.bnd similarity index 100% rename from eclipse/org.argeo.cms.e4/bnd.bnd rename to swt/org.argeo.cms.e4/bnd.bnd diff --git a/eclipse/org.argeo.cms.e4/build.properties b/swt/org.argeo.cms.e4/build.properties similarity index 100% rename from eclipse/org.argeo.cms.e4/build.properties rename to swt/org.argeo.cms.e4/build.properties diff --git a/eclipse/org.argeo.cms.e4/e4xmi/cms-devops.e4xmi b/swt/org.argeo.cms.e4/e4xmi/cms-devops.e4xmi similarity index 100% rename from eclipse/org.argeo.cms.e4/e4xmi/cms-devops.e4xmi rename to swt/org.argeo.cms.e4/e4xmi/cms-devops.e4xmi diff --git a/eclipse/org.argeo.cms.e4/e4xmi/cms-ego.e4xmi b/swt/org.argeo.cms.e4/e4xmi/cms-ego.e4xmi similarity index 100% rename from eclipse/org.argeo.cms.e4/e4xmi/cms-ego.e4xmi rename to swt/org.argeo.cms.e4/e4xmi/cms-ego.e4xmi diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/CmsE4Utils.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/CmsE4Utils.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/CmsE4Utils.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/CmsE4Utils.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/PrivilegedJob.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/PrivilegedJob.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/PrivilegedJob.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/PrivilegedJob.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/files/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/files/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/files/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/files/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangeLanguage.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangeLanguage.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangeLanguage.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangeLanguage.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseAllParts.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseAllParts.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseAllParts.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseAllParts.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/DoNothing.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/DoNothing.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/DoNothing.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/DoNothing.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LanguageMenuContribution.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LanguageMenuContribution.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LanguageMenuContribution.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LanguageMenuContribution.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SaveAllParts.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SaveAllParts.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SaveAllParts.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SaveAllParts.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SavePart.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SavePart.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SavePart.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/SavePart.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/GenericPropertyPage.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/GenericPropertyPage.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/GenericPropertyPage.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/GenericPropertyPage.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrE4DClickListener.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrE4DClickListener.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrE4DClickListener.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrE4DClickListener.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/SimplePart.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/SimplePart.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/SimplePart.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/SimplePart.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiExplorerImages.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiExplorerImages.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiExplorerImages.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/OsgiExplorerImages.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/StateLabelProvider.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/StateLabelProvider.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/StateLabelProvider.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/StateLabelProvider.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/CmsWorkbenchStyles.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/CmsWorkbenchStyles.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/CmsWorkbenchStyles.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/CmsWorkbenchStyles.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/SecurityAdminImages.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/SecurityAdminImages.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/SecurityAdminImages.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/SecurityAdminImages.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiAdminUtils.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiUserAdminListener.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiUserAdminListener.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiUserAdminListener.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UiUserAdminListener.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/package-info.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/DomainNameLP.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/DomainNameLP.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/DomainNameLP.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/DomainNameLP.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/MailLP.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/MailLP.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/MailLP.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/MailLP.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserAdminAbstractLP.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserAdminAbstractLP.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserAdminAbstractLP.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserAdminAbstractLP.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserDragListener.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserDragListener.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserDragListener.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserDragListener.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserNameLP.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserNameLP.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserNameLP.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserNameLP.java diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/package-info.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/package-info.java rename to swt/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/package-info.java diff --git a/eclipse/org.argeo.cms.swt/.classpath b/swt/org.argeo.cms.swt/.classpath similarity index 100% rename from eclipse/org.argeo.cms.swt/.classpath rename to swt/org.argeo.cms.swt/.classpath diff --git a/eclipse/org.argeo.cms.swt/.project b/swt/org.argeo.cms.swt/.project similarity index 100% rename from eclipse/org.argeo.cms.swt/.project rename to swt/org.argeo.cms.swt/.project diff --git a/eclipse/org.argeo.cms.swt/META-INF/.gitignore b/swt/org.argeo.cms.swt/META-INF/.gitignore similarity index 100% rename from eclipse/org.argeo.cms.swt/META-INF/.gitignore rename to swt/org.argeo.cms.swt/META-INF/.gitignore diff --git a/eclipse/org.argeo.cms.swt/OSGI-INF/cmsUserApp.xml b/swt/org.argeo.cms.swt/OSGI-INF/cmsUserApp.xml similarity index 100% rename from eclipse/org.argeo.cms.swt/OSGI-INF/cmsUserApp.xml rename to swt/org.argeo.cms.swt/OSGI-INF/cmsUserApp.xml diff --git a/eclipse/org.argeo.cms.swt/bnd.bnd b/swt/org.argeo.cms.swt/bnd.bnd similarity index 100% rename from eclipse/org.argeo.cms.swt/bnd.bnd rename to swt/org.argeo.cms.swt/bnd.bnd diff --git a/eclipse/org.argeo.cms.swt/build.properties b/swt/org.argeo.cms.swt/build.properties similarity index 100% rename from eclipse/org.argeo.cms.swt/build.properties rename to swt/org.argeo.cms.swt/build.properties diff --git a/eclipse/org.argeo.cms.swt/icons/actions/add.png b/swt/org.argeo.cms.swt/icons/actions/add.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/actions/add.png rename to swt/org.argeo.cms.swt/icons/actions/add.png diff --git a/eclipse/org.argeo.cms.swt/icons/actions/close-all.png b/swt/org.argeo.cms.swt/icons/actions/close-all.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/actions/close-all.png rename to swt/org.argeo.cms.swt/icons/actions/close-all.png diff --git a/eclipse/org.argeo.cms.swt/icons/actions/delete.png b/swt/org.argeo.cms.swt/icons/actions/delete.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/actions/delete.png rename to swt/org.argeo.cms.swt/icons/actions/delete.png diff --git a/eclipse/org.argeo.cms.swt/icons/actions/edit.png b/swt/org.argeo.cms.swt/icons/actions/edit.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/actions/edit.png rename to swt/org.argeo.cms.swt/icons/actions/edit.png diff --git a/eclipse/org.argeo.cms.swt/icons/actions/save-all.png b/swt/org.argeo.cms.swt/icons/actions/save-all.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/actions/save-all.png rename to swt/org.argeo.cms.swt/icons/actions/save-all.png diff --git a/eclipse/org.argeo.cms.swt/icons/actions/save.png b/swt/org.argeo.cms.swt/icons/actions/save.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/actions/save.png rename to swt/org.argeo.cms.swt/icons/actions/save.png diff --git a/eclipse/org.argeo.cms.swt/icons/active.gif b/swt/org.argeo.cms.swt/icons/active.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/active.gif rename to swt/org.argeo.cms.swt/icons/active.gif diff --git a/eclipse/org.argeo.cms.swt/icons/add.gif b/swt/org.argeo.cms.swt/icons/add.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/add.gif rename to swt/org.argeo.cms.swt/icons/add.gif diff --git a/eclipse/org.argeo.cms.swt/icons/add.png b/swt/org.argeo.cms.swt/icons/add.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/add.png rename to swt/org.argeo.cms.swt/icons/add.png diff --git a/eclipse/org.argeo.cms.swt/icons/addFolder.gif b/swt/org.argeo.cms.swt/icons/addFolder.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/addFolder.gif rename to swt/org.argeo.cms.swt/icons/addFolder.gif diff --git a/eclipse/org.argeo.cms.swt/icons/addPrivileges.gif b/swt/org.argeo.cms.swt/icons/addPrivileges.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/addPrivileges.gif rename to swt/org.argeo.cms.swt/icons/addPrivileges.gif diff --git a/eclipse/org.argeo.cms.swt/icons/addRepo.gif b/swt/org.argeo.cms.swt/icons/addRepo.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/addRepo.gif rename to swt/org.argeo.cms.swt/icons/addRepo.gif diff --git a/eclipse/org.argeo.cms.swt/icons/addWorkspace.png b/swt/org.argeo.cms.swt/icons/addWorkspace.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/addWorkspace.png rename to swt/org.argeo.cms.swt/icons/addWorkspace.png diff --git a/eclipse/org.argeo.cms.swt/icons/adminLog.gif b/swt/org.argeo.cms.swt/icons/adminLog.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/adminLog.gif rename to swt/org.argeo.cms.swt/icons/adminLog.gif diff --git a/eclipse/org.argeo.cms.swt/icons/batch.gif b/swt/org.argeo.cms.swt/icons/batch.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/batch.gif rename to swt/org.argeo.cms.swt/icons/batch.gif diff --git a/eclipse/org.argeo.cms.swt/icons/begin.gif b/swt/org.argeo.cms.swt/icons/begin.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/begin.gif rename to swt/org.argeo.cms.swt/icons/begin.gif diff --git a/eclipse/org.argeo.cms.swt/icons/binary.png b/swt/org.argeo.cms.swt/icons/binary.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/binary.png rename to swt/org.argeo.cms.swt/icons/binary.png diff --git a/eclipse/org.argeo.cms.swt/icons/browser.gif b/swt/org.argeo.cms.swt/icons/browser.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/browser.gif rename to swt/org.argeo.cms.swt/icons/browser.gif diff --git a/eclipse/org.argeo.cms.swt/icons/bundles.gif b/swt/org.argeo.cms.swt/icons/bundles.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/bundles.gif rename to swt/org.argeo.cms.swt/icons/bundles.gif diff --git a/eclipse/org.argeo.cms.swt/icons/changePassword.gif b/swt/org.argeo.cms.swt/icons/changePassword.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/changePassword.gif rename to swt/org.argeo.cms.swt/icons/changePassword.gif diff --git a/eclipse/org.argeo.cms.swt/icons/clear.gif b/swt/org.argeo.cms.swt/icons/clear.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/clear.gif rename to swt/org.argeo.cms.swt/icons/clear.gif diff --git a/eclipse/org.argeo.cms.swt/icons/close-all.png b/swt/org.argeo.cms.swt/icons/close-all.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/close-all.png rename to swt/org.argeo.cms.swt/icons/close-all.png diff --git a/eclipse/org.argeo.cms.swt/icons/commit.gif b/swt/org.argeo.cms.swt/icons/commit.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/commit.gif rename to swt/org.argeo.cms.swt/icons/commit.gif diff --git a/eclipse/org.argeo.cms.swt/icons/delete.png b/swt/org.argeo.cms.swt/icons/delete.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/delete.png rename to swt/org.argeo.cms.swt/icons/delete.png diff --git a/eclipse/org.argeo.cms.swt/icons/dumpNode.gif b/swt/org.argeo.cms.swt/icons/dumpNode.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/dumpNode.gif rename to swt/org.argeo.cms.swt/icons/dumpNode.gif diff --git a/eclipse/org.argeo.cms.swt/icons/file.gif b/swt/org.argeo.cms.swt/icons/file.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/file.gif rename to swt/org.argeo.cms.swt/icons/file.gif diff --git a/eclipse/org.argeo.cms.swt/icons/folder.gif b/swt/org.argeo.cms.swt/icons/folder.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/folder.gif rename to swt/org.argeo.cms.swt/icons/folder.gif diff --git a/eclipse/org.argeo.cms.swt/icons/getSize.gif b/swt/org.argeo.cms.swt/icons/getSize.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/getSize.gif rename to swt/org.argeo.cms.swt/icons/getSize.gif diff --git a/eclipse/org.argeo.cms.swt/icons/group.png b/swt/org.argeo.cms.swt/icons/group.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/group.png rename to swt/org.argeo.cms.swt/icons/group.png diff --git a/eclipse/org.argeo.cms.swt/icons/home.gif b/swt/org.argeo.cms.swt/icons/home.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/home.gif rename to swt/org.argeo.cms.swt/icons/home.gif diff --git a/eclipse/org.argeo.cms.swt/icons/home.png b/swt/org.argeo.cms.swt/icons/home.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/home.png rename to swt/org.argeo.cms.swt/icons/home.png diff --git a/eclipse/org.argeo.cms.swt/icons/import_fs.png b/swt/org.argeo.cms.swt/icons/import_fs.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/import_fs.png rename to swt/org.argeo.cms.swt/icons/import_fs.png diff --git a/eclipse/org.argeo.cms.swt/icons/installed.gif b/swt/org.argeo.cms.swt/icons/installed.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/installed.gif rename to swt/org.argeo.cms.swt/icons/installed.gif diff --git a/eclipse/org.argeo.cms.swt/icons/log.gif b/swt/org.argeo.cms.swt/icons/log.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/log.gif rename to swt/org.argeo.cms.swt/icons/log.gif diff --git a/eclipse/org.argeo.cms.swt/icons/logout.png b/swt/org.argeo.cms.swt/icons/logout.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/logout.png rename to swt/org.argeo.cms.swt/icons/logout.png diff --git a/eclipse/org.argeo.cms.swt/icons/maintenance.gif b/swt/org.argeo.cms.swt/icons/maintenance.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/maintenance.gif rename to swt/org.argeo.cms.swt/icons/maintenance.gif diff --git a/eclipse/org.argeo.cms.swt/icons/node.gif b/swt/org.argeo.cms.swt/icons/node.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/node.gif rename to swt/org.argeo.cms.swt/icons/node.gif diff --git a/eclipse/org.argeo.cms.swt/icons/nodes.gif b/swt/org.argeo.cms.swt/icons/nodes.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/nodes.gif rename to swt/org.argeo.cms.swt/icons/nodes.gif diff --git a/eclipse/org.argeo.cms.swt/icons/osgi_explorer.gif b/swt/org.argeo.cms.swt/icons/osgi_explorer.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/osgi_explorer.gif rename to swt/org.argeo.cms.swt/icons/osgi_explorer.gif diff --git a/eclipse/org.argeo.cms.swt/icons/password.gif b/swt/org.argeo.cms.swt/icons/password.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/password.gif rename to swt/org.argeo.cms.swt/icons/password.gif diff --git a/eclipse/org.argeo.cms.swt/icons/person-logged-in.png b/swt/org.argeo.cms.swt/icons/person-logged-in.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/person-logged-in.png rename to swt/org.argeo.cms.swt/icons/person-logged-in.png diff --git a/eclipse/org.argeo.cms.swt/icons/person.png b/swt/org.argeo.cms.swt/icons/person.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/person.png rename to swt/org.argeo.cms.swt/icons/person.png diff --git a/eclipse/org.argeo.cms.swt/icons/query.png b/swt/org.argeo.cms.swt/icons/query.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/query.png rename to swt/org.argeo.cms.swt/icons/query.png diff --git a/eclipse/org.argeo.cms.swt/icons/refresh.png b/swt/org.argeo.cms.swt/icons/refresh.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/refresh.png rename to swt/org.argeo.cms.swt/icons/refresh.png diff --git a/eclipse/org.argeo.cms.swt/icons/remote_connected.gif b/swt/org.argeo.cms.swt/icons/remote_connected.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/remote_connected.gif rename to swt/org.argeo.cms.swt/icons/remote_connected.gif diff --git a/eclipse/org.argeo.cms.swt/icons/remote_disconnected.gif b/swt/org.argeo.cms.swt/icons/remote_disconnected.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/remote_disconnected.gif rename to swt/org.argeo.cms.swt/icons/remote_disconnected.gif diff --git a/eclipse/org.argeo.cms.swt/icons/remove.gif b/swt/org.argeo.cms.swt/icons/remove.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/remove.gif rename to swt/org.argeo.cms.swt/icons/remove.gif diff --git a/eclipse/org.argeo.cms.swt/icons/removePrivileges.gif b/swt/org.argeo.cms.swt/icons/removePrivileges.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/removePrivileges.gif rename to swt/org.argeo.cms.swt/icons/removePrivileges.gif diff --git a/eclipse/org.argeo.cms.swt/icons/rename.gif b/swt/org.argeo.cms.swt/icons/rename.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/rename.gif rename to swt/org.argeo.cms.swt/icons/rename.gif diff --git a/eclipse/org.argeo.cms.swt/icons/repositories.gif b/swt/org.argeo.cms.swt/icons/repositories.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/repositories.gif rename to swt/org.argeo.cms.swt/icons/repositories.gif diff --git a/eclipse/org.argeo.cms.swt/icons/repository_connected.gif b/swt/org.argeo.cms.swt/icons/repository_connected.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/repository_connected.gif rename to swt/org.argeo.cms.swt/icons/repository_connected.gif diff --git a/eclipse/org.argeo.cms.swt/icons/repository_disconnected.gif b/swt/org.argeo.cms.swt/icons/repository_disconnected.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/repository_disconnected.gif rename to swt/org.argeo.cms.swt/icons/repository_disconnected.gif diff --git a/eclipse/org.argeo.cms.swt/icons/resolved.gif b/swt/org.argeo.cms.swt/icons/resolved.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/resolved.gif rename to swt/org.argeo.cms.swt/icons/resolved.gif diff --git a/eclipse/org.argeo.cms.swt/icons/role.gif b/swt/org.argeo.cms.swt/icons/role.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/role.gif rename to swt/org.argeo.cms.swt/icons/role.gif diff --git a/eclipse/org.argeo.cms.swt/icons/rollback.gif b/swt/org.argeo.cms.swt/icons/rollback.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/rollback.gif rename to swt/org.argeo.cms.swt/icons/rollback.gif diff --git a/eclipse/org.argeo.cms.swt/icons/save-all.png b/swt/org.argeo.cms.swt/icons/save-all.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/save-all.png rename to swt/org.argeo.cms.swt/icons/save-all.png diff --git a/eclipse/org.argeo.cms.swt/icons/save.gif b/swt/org.argeo.cms.swt/icons/save.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/save.gif rename to swt/org.argeo.cms.swt/icons/save.gif diff --git a/eclipse/org.argeo.cms.swt/icons/save.png b/swt/org.argeo.cms.swt/icons/save.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/save.png rename to swt/org.argeo.cms.swt/icons/save.png diff --git a/eclipse/org.argeo.cms.swt/icons/save_security.png b/swt/org.argeo.cms.swt/icons/save_security.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/save_security.png rename to swt/org.argeo.cms.swt/icons/save_security.png diff --git a/eclipse/org.argeo.cms.swt/icons/save_security_disabled.png b/swt/org.argeo.cms.swt/icons/save_security_disabled.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/save_security_disabled.png rename to swt/org.argeo.cms.swt/icons/save_security_disabled.png diff --git a/eclipse/org.argeo.cms.swt/icons/security.gif b/swt/org.argeo.cms.swt/icons/security.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/security.gif rename to swt/org.argeo.cms.swt/icons/security.gif diff --git a/eclipse/org.argeo.cms.swt/icons/service_published.gif b/swt/org.argeo.cms.swt/icons/service_published.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/service_published.gif rename to swt/org.argeo.cms.swt/icons/service_published.gif diff --git a/eclipse/org.argeo.cms.swt/icons/service_referenced.gif b/swt/org.argeo.cms.swt/icons/service_referenced.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/service_referenced.gif rename to swt/org.argeo.cms.swt/icons/service_referenced.gif diff --git a/eclipse/org.argeo.cms.swt/icons/sort.gif b/swt/org.argeo.cms.swt/icons/sort.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/sort.gif rename to swt/org.argeo.cms.swt/icons/sort.gif diff --git a/eclipse/org.argeo.cms.swt/icons/starting.gif b/swt/org.argeo.cms.swt/icons/starting.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/starting.gif rename to swt/org.argeo.cms.swt/icons/starting.gif diff --git a/eclipse/org.argeo.cms.swt/icons/sync.gif b/swt/org.argeo.cms.swt/icons/sync.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/sync.gif rename to swt/org.argeo.cms.swt/icons/sync.gif diff --git a/eclipse/org.argeo.cms.swt/icons/user.gif b/swt/org.argeo.cms.swt/icons/user.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/user.gif rename to swt/org.argeo.cms.swt/icons/user.gif diff --git a/eclipse/org.argeo.cms.swt/icons/users.gif b/swt/org.argeo.cms.swt/icons/users.gif similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/users.gif rename to swt/org.argeo.cms.swt/icons/users.gif diff --git a/eclipse/org.argeo.cms.swt/icons/workgroup.png b/swt/org.argeo.cms.swt/icons/workgroup.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/workgroup.png rename to swt/org.argeo.cms.swt/icons/workgroup.png diff --git a/eclipse/org.argeo.cms.swt/icons/workgroup.xcf b/swt/org.argeo.cms.swt/icons/workgroup.xcf similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/workgroup.xcf rename to swt/org.argeo.cms.swt/icons/workgroup.xcf diff --git a/eclipse/org.argeo.cms.swt/icons/workspace_connected.png b/swt/org.argeo.cms.swt/icons/workspace_connected.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/workspace_connected.png rename to swt/org.argeo.cms.swt/icons/workspace_connected.png diff --git a/eclipse/org.argeo.cms.swt/icons/workspace_disconnected.png b/swt/org.argeo.cms.swt/icons/workspace_disconnected.png similarity index 100% rename from eclipse/org.argeo.cms.swt/icons/workspace_disconnected.png rename to swt/org.argeo.cms.swt/icons/workspace_disconnected.png diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/jface/dialog/CmsWizardDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/jface/dialog/CmsWizardDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/jface/dialog/CmsWizardDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/jface/dialog/CmsWizardDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsException.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsException.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsException.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsException.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsStyles.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsStyles.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsStyles.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsStyles.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDoubleClick.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDoubleClick.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDoubleClick.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDoubleClick.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDown.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDown.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDown.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/MouseDown.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/Selected.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/Selected.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/Selected.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/Selected.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtUiProvider.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtUiProvider.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtUiProvider.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtUiProvider.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/AcrContentTreeView.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/app/AcrContentTreeView.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/AcrContentTreeView.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/app/AcrContentTreeView.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CompositeCallbackHandler.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CompositeCallbackHandler.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CompositeCallbackHandler.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CompositeCallbackHandler.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/DynamicCallbackHandler.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/DynamicCallbackHandler.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/DynamicCallbackHandler.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/DynamicCallbackHandler.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/LocaleChoice.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/LocaleChoice.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/LocaleChoice.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/LocaleChoice.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsFeedback.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsFeedback.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsFeedback.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsFeedback.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsMessageDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsMessageDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsMessageDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsMessageDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/LightweightDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/LightweightDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/LightweightDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/LightweightDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/SingleValueDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/SingleValueDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/SingleValueDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/SingleValueDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UserLP.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UserLP.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UserLP.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UserLP.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UsersImages.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UsersImages.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UsersImages.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/UsersImages.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/useradmin/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/AbstractSwtPart.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/AbstractSwtPart.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/AbstractSwtPart.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/AbstractSwtPart.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ContextOverlay.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ContextOverlay.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ContextOverlay.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ContextOverlay.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/EditableText.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/EditableText.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/EditableText.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/EditableText.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/StyledControl.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/StyledControl.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/StyledControl.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/StyledControl.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtHierarchicalPart.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtHierarchicalPart.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtHierarchicalPart.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtHierarchicalPart.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabularPart.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabularPart.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabularPart.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabularPart.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java b/swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java rename to swt/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java diff --git a/rap/org.argeo.cms.e4.rap/.classpath b/swt/rap/org.argeo.cms.e4.rap/.classpath similarity index 100% rename from rap/org.argeo.cms.e4.rap/.classpath rename to swt/rap/org.argeo.cms.e4.rap/.classpath diff --git a/rap/org.argeo.cms.e4.rap/.project b/swt/rap/org.argeo.cms.e4.rap/.project similarity index 100% rename from rap/org.argeo.cms.e4.rap/.project rename to swt/rap/org.argeo.cms.e4.rap/.project diff --git a/rap/org.argeo.cms.e4.rap/META-INF/.gitignore b/swt/rap/org.argeo.cms.e4.rap/META-INF/.gitignore similarity index 100% rename from rap/org.argeo.cms.e4.rap/META-INF/.gitignore rename to swt/rap/org.argeo.cms.e4.rap/META-INF/.gitignore diff --git a/rap/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml b/swt/rap/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml similarity index 100% rename from rap/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml rename to swt/rap/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml diff --git a/rap/org.argeo.cms.e4.rap/bnd.bnd b/swt/rap/org.argeo.cms.e4.rap/bnd.bnd similarity index 100% rename from rap/org.argeo.cms.e4.rap/bnd.bnd rename to swt/rap/org.argeo.cms.e4.rap/bnd.bnd diff --git a/rap/org.argeo.cms.e4.rap/build.properties b/swt/rap/org.argeo.cms.e4.rap/build.properties similarity index 100% rename from rap/org.argeo.cms.e4.rap/build.properties rename to swt/rap/org.argeo.cms.e4.rap/build.properties diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java similarity index 100% rename from rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java rename to swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java similarity index 100% rename from rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java rename to swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java similarity index 100% rename from rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java rename to swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java similarity index 100% rename from rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java rename to swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java similarity index 100% rename from rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java rename to swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java similarity index 100% rename from rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java rename to swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java diff --git a/swt/rap/org.argeo.cms.swt.rap.cli/.classpath b/swt/rap/org.argeo.cms.swt.rap.cli/.classpath new file mode 100644 index 000000000..81fe078c2 --- /dev/null +++ b/swt/rap/org.argeo.cms.swt.rap.cli/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/swt/rap/org.argeo.cms.swt.rap.cli/.project b/swt/rap/org.argeo.cms.swt.rap.cli/.project new file mode 100644 index 000000000..7b3af9dc9 --- /dev/null +++ b/swt/rap/org.argeo.cms.swt.rap.cli/.project @@ -0,0 +1,28 @@ + + + org.argeo.cms.swt.rap.cli + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/rap/org.argeo.cms.ui.rap/bnd.bnd b/swt/rap/org.argeo.cms.swt.rap.cli/bnd.bnd similarity index 63% rename from rap/org.argeo.cms.ui.rap/bnd.bnd rename to swt/rap/org.argeo.cms.swt.rap.cli/bnd.bnd index 1d7c4b08b..4dce79bc7 100644 --- a/rap/org.argeo.cms.ui.rap/bnd.bnd +++ b/swt/rap/org.argeo.cms.swt.rap.cli/bnd.bnd @@ -1,18 +1,8 @@ -Import-Package:\ -org.argeo.api.acr,\ -org.eclipse.swt,\ -org.argeo.eclipse.ui,\ -javax.jcr.nodetype,\ -javax.jcr.security,\ -org.eclipse.swt.graphics,\ +Import-Package: \ org.eclipse.jetty.util.component;version="[9.4,12)";resolution:=optional,\ org.eclipse.jetty.http;version="[9.4,12)";resolution:=optional,\ org.eclipse.jetty.io;version="[9.4,12)";resolution:=optional,\ org.eclipse.jetty.security;version="[9.4,12)";resolution:=optional,\ org.eclipse.jetty.server.handler;version="[9.4,12)";resolution:=optional,\ org.eclipse.jetty.*;version="[9.4,12)";resolution:=optional,\ -javax.servlet.*;version="[3,5)",\ -* - -Service-Component: OSGI-INF/cmsWebAppFactory.xml - +* \ No newline at end of file diff --git a/swt/rap/org.argeo.cms.swt.rap.cli/build.properties b/swt/rap/org.argeo.cms.swt.rap.cli/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/swt/rap/org.argeo.cms.swt.rap.cli/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/CmsRapCli.java b/swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/CmsRapCli.java new file mode 100644 index 000000000..8d0fff4f3 --- /dev/null +++ b/swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/CmsRapCli.java @@ -0,0 +1,123 @@ +package org.argeo.cms.swt.rap.cli; + +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.argeo.api.acr.spi.ProvidedRepository; +import org.argeo.api.cli.CommandsCli; +import org.argeo.api.cli.DescribedCommand; +import org.argeo.api.cms.CmsApp; +import org.argeo.api.cms.CmsContext; +import org.argeo.cms.runtime.StaticCms; +import org.argeo.cms.swt.app.CmsUserApp; +import org.argeo.cms.web.CmsWebApp; +import org.argeo.util.register.Component; +import org.argeo.util.register.ComponentRegister; +import org.eclipse.rap.rwt.application.ApplicationConfiguration; + +public class CmsRapCli extends CommandsCli { + + public CmsRapCli(String commandName) { + super(commandName); + addCommand("user", new Launch()); + } + + @Override + public String getDescription() { + return "Argeo CMS utilities."; + } + + public static void main(String[] args) { + mainImpl(new CmsRapCli("web"), args); + } + + static class Launch implements DescribedCommand { + private Option dataOption; + private Option uiOption; + + @Override + public Options getOptions() { + Options options = new Options(); + dataOption = Option.builder().longOpt("data").hasArg().required() + .desc("path to the writable data area (mandatory)").build(); + uiOption = Option.builder().longOpt("ui").desc("open a user interface").build(); + options.addOption(dataOption); + options.addOption(uiOption); + return options; + } + + @Override + public String apply(List args) { + CommandLine cl = toCommandLine(args); + String dataPath = cl.getOptionValue(dataOption); + boolean ui = cl.hasOption(uiOption); + + Path instancePath = Paths.get(dataPath); + System.setProperty("osgi.instance.area", instancePath.toUri().toString()); + + StaticCms staticCms = new StaticCms() { + @Override + protected void addComponents(ComponentRegister register) { + if (ui) { + CmsUserApp cmsApp = new CmsUserApp(); + Component cmsAppC = new Component.Builder<>(cmsApp) // + .addType(CmsApp.class) // + .addType(CmsUserApp.class) // + .addDependency(register.getSingleton(CmsContext.class), cmsApp::setCmsContext, null) // + .addDependency(register.getSingleton(ProvidedRepository.class), + cmsApp::setContentRepository, null) // + .build(register); + + CmsWebApp cmsWebApp = new CmsWebApp(); + Component cmsWebAppC = new Component.Builder<>(cmsWebApp) // + .addType(ApplicationConfiguration.class) // + .addDependency(cmsAppC.getType(CmsApp.class), cmsWebApp::setCmsApp, null) // + .build(register); + + RwtRunner rwtRunner = new RwtRunner(); + Component rwtRunnerC = new Component.Builder<>(rwtRunner) // + .addActivation(rwtRunner::init) // + .addDeactivation(rwtRunner::destroy) // + .addType(RwtRunner.class) // + .addDependency(cmsWebAppC.getType(ApplicationConfiguration.class), + rwtRunner::setApplicationConfiguration, null) // + .build(register); + } + } + + }; + Runtime.getRuntime().addShutdownHook(new Thread(() -> staticCms.stop(), "Static CMS Shutdown")); + staticCms.start(); + + long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); + System.out.println("Static CMS available in " + jvmUptime + " ms."); + + if (ui) { + try { + // open browser in app mode + Thread.sleep(2000);// wait for RWT to be ready + Runtime.getRuntime().exec("google-chrome --app=http://localhost:" + + staticCms.getComponentRegister().getObject(RwtRunner.class).getEffectivePort() + "/data"); + } catch (InterruptedException | IOException e) { + e.printStackTrace(); + } + } + + staticCms.waitForStop(); + + return null; + } + + @Override + public String getDescription() { + return "Launch a static CMS."; + } + + } +} diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java b/swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/RwtRunner.java similarity index 72% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java rename to swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/RwtRunner.java index 29165a4ef..6b678a83c 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java +++ b/swt/rap/org.argeo.cms.swt.rap.cli/src/org/argeo/cms/swt/rap/cli/RwtRunner.java @@ -1,9 +1,10 @@ -package org.argeo.eclipse.ui.jetty; +package org.argeo.cms.swt.rap.cli; import java.io.IOException; import java.lang.management.ManagementFactory; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Objects; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; @@ -17,9 +18,9 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.rap.rwt.application.AbstractEntryPoint; +import org.eclipse.rap.rwt.application.ApplicationConfiguration; import org.eclipse.rap.rwt.application.ApplicationRunner; import org.eclipse.rap.rwt.engine.RWTServlet; -import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; @@ -31,6 +32,8 @@ public class RwtRunner { private final ServerConnector serverConnector; private Path tempDir; + private ApplicationConfiguration applicationConfiguration; + public RwtRunner() { server = new Server(new QueuedThreadPool(10, 1)); serverConnector = new ServerConnector(server); @@ -39,15 +42,17 @@ public class RwtRunner { } protected Control createUi(Composite parent, Object context) { - return new Label(parent, SWT.NONE); + return new Label(parent, 0); } public void init() { + Objects.requireNonNull(applicationConfiguration); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/"); server.setHandler(context); - String entryPoint = "app"; + String entryPoint = "data"; // rwt-resources requires a file system try { @@ -61,15 +66,7 @@ public class RwtRunner { @Override public void contextInitialized(ServletContextEvent sce) { - applicationRunner = new ApplicationRunner( - (application) -> application.addEntryPoint("/" + entryPoint, () -> new AbstractEntryPoint() { - private static final long serialVersionUID = 5678385921969090733L; - - @Override - protected void createContents(Composite parent) { - createUi(parent, null); - } - }, null), sce.getServletContext()); + applicationRunner = new ApplicationRunner(applicationConfiguration, sce.getServletContext()); applicationRunner.start(); } @@ -90,6 +87,10 @@ public class RwtRunner { } catch (Exception e) { throw new IllegalStateException("Cannot start Jetty server", e); } + Runtime.getRuntime().addShutdownHook(new Thread(() -> destroy(), "Jetty shutdown")); + + long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); + System.out.println("RWT App available in " + jvmUptime + " ms, on port " + getEffectivePort()); } public void destroy() { @@ -110,21 +111,27 @@ public class RwtRunner { server.join(); } + public void setApplicationConfiguration(ApplicationConfiguration applicationConfiguration) { + this.applicationConfiguration = applicationConfiguration; + } + public static void main(String[] args) throws Exception { - RwtRunner rwtRunner = new RwtRunner() { + RwtRunner rwtRunner = new RwtRunner(); - @Override - protected Control createUi(Composite parent, Object context) { - Label label = new Label(parent, SWT.NONE); - label.setText("Hello world!"); - return label; - } - }; + String entryPoint = "app"; + ApplicationConfiguration applicationConfiguration = (application) -> application.addEntryPoint("/" + entryPoint, + () -> new AbstractEntryPoint() { + private static final long serialVersionUID = 5678385921969090733L; + + @Override + protected void createContents(Composite parent) { + Label label = new Label(parent, 0); + label.setText("Hello world!"); + } + }, null); + + rwtRunner.setApplicationConfiguration(applicationConfiguration); rwtRunner.init(); - Runtime.getRuntime().addShutdownHook(new Thread(() -> rwtRunner.destroy(), "Jetty shutdown")); - - long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); - System.out.println("App available in " + jvmUptime + " ms, on port " + rwtRunner.getEffectivePort()); // open browser in app mode Thread.sleep(2000);// wait for RWT to be ready diff --git a/rap/org.argeo.cms.ui.rap/.classpath b/swt/rap/org.argeo.cms.swt.rap/.classpath similarity index 100% rename from rap/org.argeo.cms.ui.rap/.classpath rename to swt/rap/org.argeo.cms.swt.rap/.classpath diff --git a/rap/org.argeo.cms.ui.rap/.project b/swt/rap/org.argeo.cms.swt.rap/.project similarity index 100% rename from rap/org.argeo.cms.ui.rap/.project rename to swt/rap/org.argeo.cms.swt.rap/.project diff --git a/rap/org.argeo.cms.ui.rap/META-INF/.gitignore b/swt/rap/org.argeo.cms.swt.rap/META-INF/.gitignore similarity index 100% rename from rap/org.argeo.cms.ui.rap/META-INF/.gitignore rename to swt/rap/org.argeo.cms.swt.rap/META-INF/.gitignore diff --git a/rap/org.argeo.cms.ui.rap/OSGI-INF/cmsWebAppFactory.xml b/swt/rap/org.argeo.cms.swt.rap/OSGI-INF/cmsWebAppFactory.xml similarity index 100% rename from rap/org.argeo.cms.ui.rap/OSGI-INF/cmsWebAppFactory.xml rename to swt/rap/org.argeo.cms.swt.rap/OSGI-INF/cmsWebAppFactory.xml diff --git a/swt/rap/org.argeo.cms.swt.rap/bnd.bnd b/swt/rap/org.argeo.cms.swt.rap/bnd.bnd new file mode 100644 index 000000000..db2ac0beb --- /dev/null +++ b/swt/rap/org.argeo.cms.swt.rap/bnd.bnd @@ -0,0 +1,12 @@ +Import-Package:\ +org.argeo.api.acr,\ +org.eclipse.swt,\ +org.argeo.eclipse.ui,\ +javax.jcr.nodetype,\ +javax.jcr.security,\ +org.eclipse.swt.graphics,\ +javax.servlet.*;version="[3,5)",\ +* + +Service-Component: OSGI-INF/cmsWebAppFactory.xml + diff --git a/rap/org.argeo.cms.ui.rap/build.properties b/swt/rap/org.argeo.cms.swt.rap/build.properties similarity index 100% rename from rap/org.argeo.cms.ui.rap/build.properties rename to swt/rap/org.argeo.cms.swt.rap/build.properties diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/AppUi.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/AppUi.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/Branding.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/Branding.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/ScriptUi.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/ScriptUi.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/cms.js similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/cms.js diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/package-info.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/ui/script/package-info.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/BundleResourceLoader.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/BundleResourceLoader.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java similarity index 97% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java index a1d54cfef..0270933c0 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java +++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java @@ -121,7 +121,7 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm return bundleContext; } - public void setCmsApp(CmsApp cmsApp, Map properties) { + public void setCmsApp(CmsApp cmsApp) { this.cmsApp = cmsApp; // this.cmsAppId = properties.get(Constants.SERVICE_PID); this.cmsApp.addCmsAppListener(this); @@ -160,4 +160,8 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm this.eventAdmin = eventAdmin; } + public void setContextName(String contextName) { + this.contextName = contextName; + } + } diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/MinimalWebApp.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/MinimalWebApp.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/SimpleApp.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/SimpleApp.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/SimpleErgonomics.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/SimpleErgonomics.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/WebThemeUtils.java similarity index 100% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/WebThemeUtils.java diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java similarity index 97% rename from rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java rename to swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java index 8380a85dd..19b9fe80d 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java +++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java @@ -25,7 +25,7 @@ public class CmsWebAppFactory { if (contextName != null) { CmsWebApp cmsWebApp = new CmsWebApp(); cmsWebApp.setEventAdmin(eventAdmin); - cmsWebApp.setCmsApp(cmsApp, properties); + cmsWebApp.setCmsApp(cmsApp); Hashtable serviceProperties = new Hashtable<>(); if (!contextName.equals("")) serviceProperties.put(CONTEXT_NAME, contextName); diff --git a/rap/org.argeo.swt.specific.rap/.classpath b/swt/rap/org.argeo.swt.specific.rap/.classpath similarity index 100% rename from rap/org.argeo.swt.specific.rap/.classpath rename to swt/rap/org.argeo.swt.specific.rap/.classpath diff --git a/rap/org.argeo.swt.specific.rap/.project b/swt/rap/org.argeo.swt.specific.rap/.project similarity index 100% rename from rap/org.argeo.swt.specific.rap/.project rename to swt/rap/org.argeo.swt.specific.rap/.project diff --git a/rap/org.argeo.swt.specific.rap/META-INF/.gitignore b/swt/rap/org.argeo.swt.specific.rap/META-INF/.gitignore similarity index 100% rename from rap/org.argeo.swt.specific.rap/META-INF/.gitignore rename to swt/rap/org.argeo.swt.specific.rap/META-INF/.gitignore diff --git a/rap/org.argeo.swt.specific.rap/bnd.bnd b/swt/rap/org.argeo.swt.specific.rap/bnd.bnd similarity index 100% rename from rap/org.argeo.swt.specific.rap/bnd.bnd rename to swt/rap/org.argeo.swt.specific.rap/bnd.bnd diff --git a/rap/org.argeo.swt.specific.rap/build.properties b/swt/rap/org.argeo.swt.specific.rap/build.properties similarity index 100% rename from rap/org.argeo.swt.specific.rap/build.properties rename to swt/rap/org.argeo.swt.specific.rap/build.properties diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java diff --git a/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java b/swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java similarity index 100% rename from rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java rename to swt/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java diff --git a/rcp/org.argeo.cms.e4.rcp/.classpath b/swt/rcp/org.argeo.cms.e4.rcp/.classpath similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/.classpath rename to swt/rcp/org.argeo.cms.e4.rcp/.classpath diff --git a/rcp/org.argeo.cms.e4.rcp/.gitignore b/swt/rcp/org.argeo.cms.e4.rcp/.gitignore similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/.gitignore rename to swt/rcp/org.argeo.cms.e4.rcp/.gitignore diff --git a/rcp/org.argeo.cms.e4.rcp/.project b/swt/rcp/org.argeo.cms.e4.rcp/.project similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/.project rename to swt/rcp/org.argeo.cms.e4.rcp/.project diff --git a/rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.jdt.core.prefs b/swt/rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.jdt.core.prefs rename to swt/rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.jdt.core.prefs diff --git a/rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.pde.core.prefs b/swt/rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.pde.core.prefs rename to swt/rcp/org.argeo.cms.e4.rcp/.settings/org.eclipse.pde.core.prefs diff --git a/rcp/org.argeo.cms.e4.rcp/META-INF/.gitignore b/swt/rcp/org.argeo.cms.e4.rcp/META-INF/.gitignore similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/META-INF/.gitignore rename to swt/rcp/org.argeo.cms.e4.rcp/META-INF/.gitignore diff --git a/rcp/org.argeo.cms.e4.rcp/argeo-companion.e4xmi b/swt/rcp/org.argeo.cms.e4.rcp/argeo-companion.e4xmi similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/argeo-companion.e4xmi rename to swt/rcp/org.argeo.cms.e4.rcp/argeo-companion.e4xmi diff --git a/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties b/swt/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/argeo-companion.properties rename to swt/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties diff --git a/rcp/org.argeo.cms.e4.rcp/bnd.bnd b/swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/bnd.bnd rename to swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd diff --git a/rcp/org.argeo.cms.e4.rcp/build.properties b/swt/rcp/org.argeo.cms.e4.rcp/build.properties similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/build.properties rename to swt/rcp/org.argeo.cms.e4.rcp/build.properties diff --git a/rcp/org.argeo.cms.e4.rcp/log4j.properties b/swt/rcp/org.argeo.cms.e4.rcp/log4j.properties similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/log4j.properties rename to swt/rcp/org.argeo.cms.e4.rcp/log4j.properties diff --git a/rcp/org.argeo.cms.e4.rcp/plugin.xml b/swt/rcp/org.argeo.cms.e4.rcp/plugin.xml similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/plugin.xml rename to swt/rcp/org.argeo.cms.e4.rcp/plugin.xml diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java b/swt/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java rename to swt/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsRcpLifeCycle.java b/swt/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsRcpLifeCycle.java similarity index 100% rename from rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsRcpLifeCycle.java rename to swt/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsRcpLifeCycle.java diff --git a/swt/rcp/org.argeo.cms.swt.rcp.cli/.classpath b/swt/rcp/org.argeo.cms.swt.rcp.cli/.classpath new file mode 100644 index 000000000..81fe078c2 --- /dev/null +++ b/swt/rcp/org.argeo.cms.swt.rcp.cli/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/swt/rcp/org.argeo.cms.swt.rcp.cli/.project b/swt/rcp/org.argeo.cms.swt.rcp.cli/.project new file mode 100644 index 000000000..07c8c5d91 --- /dev/null +++ b/swt/rcp/org.argeo.cms.swt.rcp.cli/.project @@ -0,0 +1,28 @@ + + + org.argeo.cms.swt.rcp.cli + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/swt/rcp/org.argeo.cms.swt.rcp.cli/bnd.bnd b/swt/rcp/org.argeo.cms.swt.rcp.cli/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/swt/rcp/org.argeo.cms.swt.rcp.cli/build.properties b/swt/rcp/org.argeo.cms.swt.rcp.cli/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/swt/rcp/org.argeo.cms.swt.rcp.cli/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/swt/rcp/org.argeo.cms.swt.rcp.cli/src/org/argeo/cms/swt/rcp/cli/CmsCli.java b/swt/rcp/org.argeo.cms.swt.rcp.cli/src/org/argeo/cms/swt/rcp/cli/CmsCli.java new file mode 100644 index 000000000..187f5b03e --- /dev/null +++ b/swt/rcp/org.argeo.cms.swt.rcp.cli/src/org/argeo/cms/swt/rcp/cli/CmsCli.java @@ -0,0 +1,110 @@ +package org.argeo.cms.swt.rcp.cli; + +import java.lang.management.ManagementFactory; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.concurrent.ForkJoinPool; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.argeo.api.acr.spi.ProvidedRepository; +import org.argeo.api.cli.CommandsCli; +import org.argeo.api.cli.DescribedCommand; +import org.argeo.api.cms.CmsApp; +import org.argeo.cms.runtime.StaticCms; +import org.argeo.cms.swt.app.CmsUserApp; +import org.argeo.cms.ui.rcp.CmsRcpDisplayFactory; +import org.argeo.util.register.Component; +import org.argeo.util.register.ComponentRegister; + +public class CmsCli extends CommandsCli { + + public CmsCli(String commandName) { + super(commandName); + addCommand("static", new Launch()); + } + + @Override + public String getDescription() { + return "Argeo CMS utilities."; + } + + static class Launch implements DescribedCommand { + private Option dataOption; + private Option uiOption; + + @Override + public Options getOptions() { + Options options = new Options(); + dataOption = Option.builder().longOpt("data").hasArg().required() + .desc("path to the writable data area (mandatory)").build(); + uiOption = Option.builder().longOpt("ui").desc("open a user interface").build(); + options.addOption(dataOption); + options.addOption(uiOption); + return options; + } + + @Override + public String apply(List args) { + CommandLine cl = toCommandLine(args); + String dataPath = cl.getOptionValue(dataOption); + boolean ui = cl.hasOption(uiOption); + + Path instancePath = Paths.get(dataPath); + System.setProperty("osgi.instance.area", instancePath.toUri().toString()); + + StaticCms staticCms = new StaticCms() { + @Override + protected void addComponents(ComponentRegister register) { + if (ui) { + Component contentRepositoryC = register + .find(ProvidedRepository.class, null).first(); + CmsUserApp cmsApp = new CmsUserApp(); + Component cmsAppC = new Component.Builder<>(cmsApp) // + .addType(CmsApp.class) // + .addType(CmsUserApp.class) // + .addDependency(contentRepositoryC.getType(ProvidedRepository.class), + cmsApp::setContentRepository, null) // + .build(register); + + CmsRcpDisplayFactory displayFactory = new CmsRcpDisplayFactory(); + Component displayFactoryC = new Component.Builder<>(displayFactory) // + .addActivation(displayFactory::init) // + .addDeactivation(displayFactory::destroy) // + .build(register); + + } + } + + @Override + protected void postActivation(ComponentRegister register) { + if (ui) { + Component cmsAppC = register.find(CmsUserApp.class, null).first(); + CmsRcpDisplayFactory.openCmsApp(null, cmsAppC.get(), "data", (e) -> { + // asynchronous in order to avoid deadlock in UI thread + ForkJoinPool.commonPool().execute(() -> stop()); + }); + } + } + + }; + Runtime.getRuntime().addShutdownHook(new Thread(() -> staticCms.stop(), "Static CMS Shutdown")); + staticCms.start(); + + long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); + System.out.println("Static CMS available in " + jvmUptime + " ms."); + + staticCms.waitForStop(); + + return null; + } + + @Override + public String getDescription() { + return "Launch a static CMS."; + } + + } +} diff --git a/rcp/org.argeo.cms.ui.rcp/.classpath b/swt/rcp/org.argeo.cms.swt.rcp/.classpath similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/.classpath rename to swt/rcp/org.argeo.cms.swt.rcp/.classpath diff --git a/rcp/org.argeo.cms.ui.rcp/.gitignore b/swt/rcp/org.argeo.cms.swt.rcp/.gitignore similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/.gitignore rename to swt/rcp/org.argeo.cms.swt.rcp/.gitignore diff --git a/rcp/org.argeo.cms.ui.rcp/.project b/swt/rcp/org.argeo.cms.swt.rcp/.project similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/.project rename to swt/rcp/org.argeo.cms.swt.rcp/.project diff --git a/rcp/org.argeo.cms.ui.rcp/META-INF/.gitignore b/swt/rcp/org.argeo.cms.swt.rcp/META-INF/.gitignore similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/META-INF/.gitignore rename to swt/rcp/org.argeo.cms.swt.rcp/META-INF/.gitignore diff --git a/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpDisplayFactory.xml b/swt/rcp/org.argeo.cms.swt.rcp/OSGI-INF/cmsRcpDisplayFactory.xml similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpDisplayFactory.xml rename to swt/rcp/org.argeo.cms.swt.rcp/OSGI-INF/cmsRcpDisplayFactory.xml diff --git a/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpServletFactory.xml b/swt/rcp/org.argeo.cms.swt.rcp/OSGI-INF/cmsRcpServletFactory.xml similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpServletFactory.xml rename to swt/rcp/org.argeo.cms.swt.rcp/OSGI-INF/cmsRcpServletFactory.xml diff --git a/rcp/org.argeo.cms.ui.rcp/bnd.bnd b/swt/rcp/org.argeo.cms.swt.rcp/bnd.bnd similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/bnd.bnd rename to swt/rcp/org.argeo.cms.swt.rcp/bnd.bnd diff --git a/rcp/org.argeo.cms.ui.rcp/build.properties b/swt/rcp/org.argeo.cms.swt.rcp/build.properties similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/build.properties rename to swt/rcp/org.argeo.cms.swt.rcp/build.properties diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java rename to swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java rename to swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java rename to swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java similarity index 100% rename from rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java rename to swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java diff --git a/rcp/org.argeo.swt.specific.rcp/.classpath b/swt/rcp/org.argeo.swt.specific.rcp/.classpath similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/.classpath rename to swt/rcp/org.argeo.swt.specific.rcp/.classpath diff --git a/rcp/org.argeo.swt.specific.rcp/.gitignore b/swt/rcp/org.argeo.swt.specific.rcp/.gitignore similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/.gitignore rename to swt/rcp/org.argeo.swt.specific.rcp/.gitignore diff --git a/rcp/org.argeo.swt.specific.rcp/.project b/swt/rcp/org.argeo.swt.specific.rcp/.project similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/.project rename to swt/rcp/org.argeo.swt.specific.rcp/.project diff --git a/rcp/org.argeo.swt.specific.rcp/META-INF/.gitignore b/swt/rcp/org.argeo.swt.specific.rcp/META-INF/.gitignore similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/META-INF/.gitignore rename to swt/rcp/org.argeo.swt.specific.rcp/META-INF/.gitignore diff --git a/rcp/org.argeo.swt.specific.rcp/bnd.bnd b/swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/bnd.bnd rename to swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd diff --git a/rcp/org.argeo.swt.specific.rcp/build.properties b/swt/rcp/org.argeo.swt.specific.rcp/build.properties similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/build.properties rename to swt/rcp/org.argeo.swt.specific.rcp/build.properties diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpClient.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpClient.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpClient.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpClient.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/BufferedImageDisplay.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiConstants.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiConstants.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiConstants.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiConstants.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/UiContext.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/UiContext.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/UiContext.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/specific/UiContext.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileDetails.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileDetails.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileDetails.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileDetails.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadEvent.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadEvent.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadEvent.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadEvent.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadHandler.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadHandler.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadHandler.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadHandler.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadListener.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadListener.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadListener.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadListener.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadReceiver.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadReceiver.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadReceiver.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/fileupload/FileUploadReceiver.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/RWT.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/RWT.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/RWT.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/RWT.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/SingletonUtil.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/SingletonUtil.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/SingletonUtil.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/SingletonUtil.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/AbstractEntryPoint.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/AbstractEntryPoint.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/AbstractEntryPoint.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/AbstractEntryPoint.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/Application.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/Application.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/Application.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/Application.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ApplicationConfiguration.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ApplicationConfiguration.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ApplicationConfiguration.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ApplicationConfiguration.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPoint.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPoint.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPoint.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPoint.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPointFactory.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPointFactory.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPointFactory.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/EntryPointFactory.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ExceptionHandler.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ExceptionHandler.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ExceptionHandler.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/application/ExceptionHandler.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/Client.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/Client.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/Client.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/Client.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/WebClient.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/WebClient.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/WebClient.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/WebClient.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigation.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigation.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigation.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigation.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationEvent.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationEvent.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationEvent.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationEvent.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationListener.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationListener.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationListener.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/BrowserNavigationListener.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/ClientService.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/ClientService.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/ClientService.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/ClientService.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/JavaScriptExecutor.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/JavaScriptExecutor.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/JavaScriptExecutor.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/JavaScriptExecutor.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/UrlLauncher.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/UrlLauncher.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/UrlLauncher.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/client/service/UrlLauncher.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceLoader.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceLoader.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceLoader.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceLoader.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceManager.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceManager.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceManager.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ResourceManager.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ServerPushSession.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ServerPushSession.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ServerPushSession.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/service/ServerPushSession.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/DropDown.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/DropDown.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/DropDown.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/DropDown.java diff --git a/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java similarity index 100% rename from rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java rename to swt/rcp/org.argeo.swt.specific.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java -- 2.30.2