From 03f646fd0d7e7ce393694c836c779bc67a4eef55 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 9 Dec 2021 12:11:24 +0100 Subject: [PATCH] Simplify Argeo Commons project structure --- .../bnd.bnd | 0 .../build.properties | 0 .../p2.inf | 0 .../pom.xml | 194 +++++++++--------- dep/org.argeo.dep.cms.node/pom.xml | 184 ++++++++--------- dep/org.argeo.dep.cms.ui.rap/pom.xml | 55 ++--- dep/pom.xml | 2 +- org.argeo.api/pom.xml | 2 +- org.argeo.cms.e4.rap/pom.xml | 2 +- org.argeo.cms.e4/pom.xml | 2 +- org.argeo.cms.jcr/pom.xml | 17 +- .../src/org/argeo/cli/jcr/JcrCommands.java | 18 -- .../src/org/argeo/cli/jcr/JcrSync.java | 133 ------------ .../src/org/argeo/cli/jcr/package-info.java | 2 - .../org/argeo/cli/jcr/repository-localfs.xml | 76 ------- .../.classpath | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../bnd.bnd | 0 .../build.properties | 0 .../icons/actions/add.png | Bin .../icons/actions/close-all.png | Bin .../icons/actions/delete.png | Bin .../icons/actions/edit.png | Bin .../icons/actions/save-all.png | Bin .../icons/actions/save.png | Bin .../icons/active.gif | Bin .../icons/add.gif | Bin .../icons/add.png | Bin .../icons/addFolder.gif | Bin .../icons/addPrivileges.gif | Bin .../icons/addRepo.gif | Bin .../icons/addWorkspace.png | Bin .../icons/adminLog.gif | Bin .../icons/batch.gif | Bin .../icons/begin.gif | Bin .../icons/binary.png | Bin .../icons/browser.gif | Bin .../icons/bundles.gif | Bin .../icons/changePassword.gif | Bin .../icons/clear.gif | Bin .../icons/close-all.png | Bin .../icons/commit.gif | Bin .../icons/delete.png | Bin .../icons/dumpNode.gif | Bin .../icons/file.gif | Bin .../icons/folder.gif | Bin .../icons/getSize.gif | Bin .../icons/group.png | Bin .../icons/home.gif | Bin .../icons/home.png | Bin .../icons/import_fs.png | Bin .../icons/installed.gif | Bin .../icons/log.gif | Bin .../icons/logout.png | Bin .../icons/maintenance.gif | Bin .../icons/node.gif | Bin .../icons/nodes.gif | Bin .../icons/osgi_explorer.gif | Bin .../icons/password.gif | Bin .../icons/person-logged-in.png | Bin .../icons/person.png | Bin .../icons/query.png | Bin .../icons/refresh.png | Bin .../icons/remote_connected.gif | Bin .../icons/remote_disconnected.gif | Bin .../icons/remove.gif | Bin .../icons/removePrivileges.gif | Bin .../icons/rename.gif | Bin .../icons/repositories.gif | Bin .../icons/repository_connected.gif | Bin .../icons/repository_disconnected.gif | Bin .../icons/resolved.gif | Bin .../icons/role.gif | Bin .../icons/rollback.gif | Bin .../icons/save-all.png | Bin .../icons/save.gif | Bin .../icons/save.png | Bin .../icons/save_security.png | Bin .../icons/save_security_disabled.png | Bin .../icons/security.gif | Bin .../icons/service_published.gif | Bin .../icons/service_referenced.gif | Bin .../icons/sort.gif | Bin .../icons/starting.gif | Bin .../icons/sync.gif | Bin .../icons/user.gif | Bin .../icons/users.gif | Bin .../icons/workgroup.png | Bin .../icons/workgroup.xcf | Bin .../icons/workspace_connected.png | Bin .../icons/workspace_disconnected.png | Bin .../pom.xml | 6 +- .../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 .../argeo/eclipse/ui/MouseDoubleClick.java | 0 .../src/org/argeo/eclipse/ui/MouseDown.java | 0 .../src/org/argeo/eclipse/ui/Selected.java | 0 .../src/org/argeo/eclipse/ui/TreeParent.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 org.argeo.cms.ui.rap/bnd.bnd | 7 + org.argeo.cms.ui.rap/pom.xml | 9 +- .../org/argeo/eclipse/ui/jetty/RwtRunner.java | 0 org.argeo.cms.ui.theme/.classpath | 7 - org.argeo.cms.ui.theme/.project | 28 --- org.argeo.cms.ui.theme/bnd.bnd | 1 - org.argeo.cms.ui.theme/build.properties | 4 - org.argeo.cms.ui.theme/pom.xml | 27 --- org.argeo.cms.ui.theme/rap/argeo-studio.css | 21 -- org.argeo.cms.ui/pom.xml | 12 +- org.argeo.cms/pom.xml | 10 +- .../src/org/argeo/cms/cli/ArgeoCli.java | 32 --- .../src/org/argeo/cms/cli/package-info.java | 2 - org.argeo.core/.classpath | 8 - org.argeo.core/bnd.bnd | 0 org.argeo.core/build.properties | 6 - org.argeo.core/ext/test/log4j.properties | 14 -- .../ext/test/org/argeo/fs/FsUtilsTest.java | 49 ----- org.argeo.core/pom.xml | 24 --- .../org/argeo/cli/CommandArgsException.java | 32 --- .../argeo/cli/CommandRuntimeException.java | 35 ---- .../src/org/argeo/cli/CommandsCli.java | 131 ------------ .../src/org/argeo/cli/DescribedCommand.java | 55 ----- .../src/org/argeo/cli/HelpCommand.java | 143 ------------- .../src/org/argeo/cli/fs/FileSync.java | 102 --------- .../src/org/argeo/cli/fs/FsCommands.java | 18 -- .../src/org/argeo/cli/fs/PathSync.java | 61 ------ .../src/org/argeo/cli/fs/SyncFileVisitor.java | 31 --- .../src/org/argeo/cli/fs/package-info.java | 2 - .../src/org/argeo/cli/package-info.java | 2 - .../src/org/argeo/cli/posix/Echo.java | 46 ----- .../org/argeo/cli/posix/PosixCommands.java | 21 -- .../src/org/argeo/cli/posix/package-info.java | 2 - .../org/argeo/fs/BasicSyncFileVisitor.java | 164 --------------- org.argeo.core/src/org/argeo/fs/FsUtils.java | 58 ------ .../src/org/argeo/fs/package-info.java | 2 - .../src/org/argeo/sync/SyncException.java | 18 -- .../src/org/argeo/sync/SyncResult.java | 101 --------- .../src/org/argeo/sync/package-info.java | 2 - org.argeo.eclipse.ui.rap/META-INF/.gitignore | 1 - org.argeo.eclipse.ui.rap/bnd.bnd | 11 - .../argeo/eclipse/ui/specific/OpenFile.java | 73 ------- .../eclipse/ui/specific/OpenFileService.java | 96 --------- .../ui/specific/SingleSourcingException.java | 15 -- org.argeo.eclipse.ui/.project | 24 --- org.argeo.eclipse.ui/META-INF/.gitignore | 1 - .../ui/util/SingleSourcingConstants.java | 17 -- org.argeo.enterprise/pom.xml | 2 +- org.argeo.osgi.boot/pom.xml | 2 +- .../.classpath | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 org.argeo.swt.specific.rap/bnd.bnd | 5 + .../build.properties | 0 .../pom.xml | 10 +- .../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 | 2 +- .../eclipse/ui/specific/package-info.java | 0 pom.xml | 10 +- 193 files changed, 259 insertions(+), 1994 deletions(-) rename dep/{org.argeo.dep.cms.client => org.argeo.dep.cms.minimal}/bnd.bnd (100%) rename dep/{org.argeo.dep.cms.client => org.argeo.dep.cms.minimal}/build.properties (100%) rename dep/{org.argeo.dep.cms.client => org.argeo.dep.cms.minimal}/p2.inf (100%) rename dep/{org.argeo.dep.cms.client => org.argeo.dep.cms.minimal}/pom.xml (69%) delete mode 100644 org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrCommands.java delete mode 100644 org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrSync.java delete mode 100644 org.argeo.cms.jcr/src/org/argeo/cli/jcr/package-info.java delete mode 100644 org.argeo.cms.jcr/src/org/argeo/cli/jcr/repository-localfs.xml rename {org.argeo.eclipse.ui.rap => org.argeo.cms.swt}/.classpath (100%) rename {org.argeo.core => org.argeo.cms.swt}/.project (95%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/META-INF/.gitignore (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/bnd.bnd (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/build.properties (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/actions/add.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/actions/close-all.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/actions/delete.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/actions/edit.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/actions/save-all.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/actions/save.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/active.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/add.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/add.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/addFolder.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/addPrivileges.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/addRepo.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/addWorkspace.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/adminLog.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/batch.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/begin.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/binary.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/browser.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/bundles.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/changePassword.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/clear.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/close-all.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/commit.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/delete.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/dumpNode.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/file.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/folder.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/getSize.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/group.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/home.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/home.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/import_fs.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/installed.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/log.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/logout.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/maintenance.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/node.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/nodes.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/osgi_explorer.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/password.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/person-logged-in.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/person.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/query.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/refresh.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/remote_connected.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/remote_disconnected.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/remove.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/removePrivileges.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/rename.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/repositories.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/repository_connected.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/repository_disconnected.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/resolved.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/role.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/rollback.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/save-all.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/save.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/save.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/save_security.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/save_security_disabled.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/security.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/service_published.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/service_referenced.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/sort.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/starting.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/sync.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/user.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/users.gif (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/workgroup.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/workgroup.xcf (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/workspace_connected.png (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/icons/workspace_disconnected.png (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/pom.xml (90%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/src/org/argeo/cms/ui/theme/CmsImages.java (100%) rename {org.argeo.cms.ui.theme => org.argeo.cms.swt}/src/org/argeo/cms/ui/theme/package-info.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/ColumnDefinition.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/ColumnViewerComparator.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/EclipseUiException.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/EclipseUiUtils.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/FileProvider.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/GenericTableComparator.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/IListProvider.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/MouseDoubleClick.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/MouseDown.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/Selected.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/TreeParent.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/dialogs/SingleValue.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/dialogs/package-info.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/FsTableViewer.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/FsUiConstants.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/FsUiException.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/FsUiUtils.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/ParentDir.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/file.png (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/folder.png (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/fs/package-info.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/package-info.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/parts/package-info.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/util/ViewerUtils.java (100%) rename {org.argeo.eclipse.ui => org.argeo.cms.swt}/src/org/argeo/eclipse/ui/util/package-info.java (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.cms.ui.rap}/src/org/argeo/eclipse/ui/jetty/RwtRunner.java (100%) delete mode 100644 org.argeo.cms.ui.theme/.classpath delete mode 100644 org.argeo.cms.ui.theme/.project delete mode 100644 org.argeo.cms.ui.theme/bnd.bnd delete mode 100644 org.argeo.cms.ui.theme/build.properties delete mode 100644 org.argeo.cms.ui.theme/pom.xml delete mode 100644 org.argeo.cms.ui.theme/rap/argeo-studio.css delete mode 100644 org.argeo.cms/src/org/argeo/cms/cli/ArgeoCli.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/cli/package-info.java delete mode 100644 org.argeo.core/.classpath delete mode 100644 org.argeo.core/bnd.bnd delete mode 100644 org.argeo.core/build.properties delete mode 100644 org.argeo.core/ext/test/log4j.properties delete mode 100644 org.argeo.core/ext/test/org/argeo/fs/FsUtilsTest.java delete mode 100644 org.argeo.core/pom.xml delete mode 100644 org.argeo.core/src/org/argeo/cli/CommandArgsException.java delete mode 100644 org.argeo.core/src/org/argeo/cli/CommandRuntimeException.java delete mode 100644 org.argeo.core/src/org/argeo/cli/CommandsCli.java delete mode 100644 org.argeo.core/src/org/argeo/cli/DescribedCommand.java delete mode 100644 org.argeo.core/src/org/argeo/cli/HelpCommand.java delete mode 100644 org.argeo.core/src/org/argeo/cli/fs/FileSync.java delete mode 100644 org.argeo.core/src/org/argeo/cli/fs/FsCommands.java delete mode 100644 org.argeo.core/src/org/argeo/cli/fs/PathSync.java delete mode 100644 org.argeo.core/src/org/argeo/cli/fs/SyncFileVisitor.java delete mode 100644 org.argeo.core/src/org/argeo/cli/fs/package-info.java delete mode 100644 org.argeo.core/src/org/argeo/cli/package-info.java delete mode 100644 org.argeo.core/src/org/argeo/cli/posix/Echo.java delete mode 100644 org.argeo.core/src/org/argeo/cli/posix/PosixCommands.java delete mode 100644 org.argeo.core/src/org/argeo/cli/posix/package-info.java delete mode 100644 org.argeo.core/src/org/argeo/fs/BasicSyncFileVisitor.java delete mode 100644 org.argeo.core/src/org/argeo/fs/FsUtils.java delete mode 100644 org.argeo.core/src/org/argeo/fs/package-info.java delete mode 100644 org.argeo.core/src/org/argeo/sync/SyncException.java delete mode 100644 org.argeo.core/src/org/argeo/sync/SyncResult.java delete mode 100644 org.argeo.core/src/org/argeo/sync/package-info.java delete mode 100644 org.argeo.eclipse.ui.rap/META-INF/.gitignore delete mode 100644 org.argeo.eclipse.ui.rap/bnd.bnd delete mode 100644 org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java delete mode 100644 org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java delete mode 100644 org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/SingleSourcingException.java delete mode 100644 org.argeo.eclipse.ui/.project delete mode 100644 org.argeo.eclipse.ui/META-INF/.gitignore delete mode 100644 org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java rename {org.argeo.eclipse.ui => org.argeo.swt.specific.rap}/.classpath (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/.project (93%) rename {org.argeo.core => org.argeo.swt.specific.rap}/META-INF/.gitignore (100%) create mode 100644 org.argeo.swt.specific.rap/bnd.bnd rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/build.properties (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/pom.xml (83%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java (100%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/UiContext.java (94%) rename {org.argeo.eclipse.ui.rap => org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/package-info.java (100%) diff --git a/dep/org.argeo.dep.cms.client/bnd.bnd b/dep/org.argeo.dep.cms.minimal/bnd.bnd similarity index 100% rename from dep/org.argeo.dep.cms.client/bnd.bnd rename to dep/org.argeo.dep.cms.minimal/bnd.bnd diff --git a/dep/org.argeo.dep.cms.client/build.properties b/dep/org.argeo.dep.cms.minimal/build.properties similarity index 100% rename from dep/org.argeo.dep.cms.client/build.properties rename to dep/org.argeo.dep.cms.minimal/build.properties diff --git a/dep/org.argeo.dep.cms.client/p2.inf b/dep/org.argeo.dep.cms.minimal/p2.inf similarity index 100% rename from dep/org.argeo.dep.cms.client/p2.inf rename to dep/org.argeo.dep.cms.minimal/p2.inf diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.minimal/pom.xml similarity index 69% rename from dep/org.argeo.dep.cms.client/pom.xml rename to dep/org.argeo.dep.cms.minimal/pom.xml index 3c99ba16c..fd029efa4 100644 --- a/dep/org.argeo.dep.cms.client/pom.xml +++ b/dep/org.argeo.dep.cms.minimal/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.argeo.commons @@ -7,8 +9,8 @@ dep .. - org.argeo.dep.cms.client - CMS Client + org.argeo.dep.cms.minimal + CMS Minimal @@ -17,41 +19,30 @@ org.argeo.enterprise 2.3-SNAPSHOT - - - - - + + + + + + + + + + + org.argeo.commons - org.argeo.core + org.argeo.api 2.3-SNAPSHOT - - - - org.argeo.tp.javax - javax.jcr - - org.argeo.tp.javax - javax.el-api - - - org.argeo.tp.javax - javax.interceptor-api - - - org.argeo.tp.javax - javax.enterprise.cdi-api - - - - - org.argeo.tp.javax - javax.transaction-api + org.argeo.commons + org.argeo.cms + 2.3-SNAPSHOT - + + + org.argeo.tp.apache org.apache.log4j @@ -70,37 +61,34 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + org.argeo.tp.bouncycastle - bcpkix + bcprov org.argeo.tp.bouncycastle - bcpg + bcpkix + + + + - - org.argeo.tp.apache - org.apache.httpcomponents.httpcore - - - org.argeo.tp.apache - org.apache.httpcomponents.httpclient - + org.argeo.tp.apache.commons org.apache.commons.io @@ -109,30 +97,10 @@ org.argeo.tp.apache.commons org.apache.commons.codec - - org.argeo.tp.apache.commons - org.apache.commons.exec - - - org.argeo.tp.apache.commons - org.apache.commons.cli - org.argeo.tp.apache.commons org.apache.commons.httpclient - - org.argeo.tp.apache.commons - org.apache.commons.net - - - org.argeo.tp.apache.commons - org.apache.commons.collections - - - org.argeo.tp.apache.commons - org.apache.commons.compress - @@ -180,7 +148,7 @@ org.eclipse.equinox.metatype - + org.argeo.tp.apache.felix org.apache.felix.scr @@ -198,38 +166,72 @@ org.eclipse.equinox.console - + + + org.argeo.tp.javax + javax.servlet + + + + + org.argeo.tp.equinox + org.eclipse.equinox.http.servlet + + + org.argeo.tp.equinox + org.eclipse.equinox.http.jetty + + + - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.api + org.argeo.tp.jetty + org.eclipse.jetty.client - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.jcr.commons + org.argeo.tp.jetty + org.eclipse.jetty.continuation - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.spi + org.argeo.tp.jetty + org.eclipse.jetty.http - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.spi.commons + org.argeo.tp.jetty + org.eclipse.jetty.io - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.webdav + org.argeo.tp.jetty + org.eclipse.jetty.jmx - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.spi2dav + org.argeo.tp.jetty + org.eclipse.jetty.security - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.jcr2dav + org.argeo.tp.jetty + org.eclipse.jetty.server - org.argeo.tp.apache.jackrabbit - org.apache.jackrabbit.jcr2spi + org.argeo.tp.jetty + org.eclipse.jetty.servlet + + + org.argeo.tp.jetty + org.eclipse.jetty.servlets + + + org.argeo.tp.jetty + org.eclipse.jetty.util + + + org.argeo.tp.jetty + org.eclipse.jetty.xml + + + + + org.argeo.tp.misc + org.postgresql.jdbc42 @@ -274,7 +276,7 @@ rpm - argeo-cms-client${argeo.rpm.suffix} + argeo-cms-minimal${argeo.rpm.suffix} /usr/share/osgi @@ -293,7 +295,7 @@ - argeo-cms-client-tp${argeo.rpm.suffix} + argeo-cms-minimal-tp${argeo.rpm.suffix} argeo-osgi-boot${argeo.rpm.suffix} @@ -335,7 +337,7 @@ rpm - argeo-cms-client-tp${argeo.rpm.suffix} + argeo-cms-minimal-tp${argeo.rpm.suffix} ${version.argeo-tp} ${argeo.rpm.release.tp} diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index 4afc1f41a..3348ecd70 100644 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.argeo.commons @@ -9,39 +11,28 @@ org.argeo.dep.cms.node CMS Node - + org.argeo.commons - org.argeo.dep.cms.client + org.argeo.dep.cms.minimal 2.3-SNAPSHOT pom - - org.argeo.commons - org.argeo.api - 2.3-SNAPSHOT - - - - org.argeo.commons - org.argeo.cms - 2.3-SNAPSHOT - org.argeo.commons org.argeo.cms.jcr 2.3-SNAPSHOT - - - - - + + + + + @@ -53,12 +44,6 @@ - - - org.argeo.tp.bouncycastle - bcprov - - org.argeo.tp.apache.commons @@ -70,6 +55,27 @@ + + org.argeo.tp.javax + javax.jcr + + + org.argeo.tp.javax + javax.el-api + + + org.argeo.tp.javax + javax.interceptor-api + + + org.argeo.tp.javax + javax.enterprise.cdi-api + + + + org.argeo.tp.javax + javax.transaction-api + org.argeo.tp.javax javax.annotation @@ -78,6 +84,63 @@ org.argeo.tp.javax javax.inject + + + org.argeo.tp.apache.commons + org.apache.commons.net + + + org.argeo.tp.apache.commons + org.apache.commons.collections + + + org.argeo.tp.apache.commons + org.apache.commons.compress + + + + + org.argeo.tp.apache + org.apache.httpcomponents.httpcore + + + org.argeo.tp.apache + org.apache.httpcomponents.httpclient + + + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.api + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.jcr.commons + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.spi + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.spi.commons + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.webdav + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.spi2dav + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.jcr2dav + + + org.argeo.tp.apache.jackrabbit + org.apache.jackrabbit.jcr2spi + @@ -128,10 +191,6 @@ org.argeo.tp.misc org.h2 - - org.argeo.tp.misc - org.postgresql.jdbc42 - @@ -149,69 +208,6 @@ - - - org.argeo.tp.javax - javax.servlet - - - - - org.argeo.tp.equinox - org.eclipse.equinox.http.servlet - - - org.argeo.tp.equinox - org.eclipse.equinox.http.jetty - - - - - org.argeo.tp.jetty - org.eclipse.jetty.client - - - org.argeo.tp.jetty - org.eclipse.jetty.continuation - - - org.argeo.tp.jetty - org.eclipse.jetty.http - - - org.argeo.tp.jetty - org.eclipse.jetty.io - - - org.argeo.tp.jetty - org.eclipse.jetty.jmx - - - org.argeo.tp.jetty - org.eclipse.jetty.security - - - org.argeo.tp.jetty - org.eclipse.jetty.server - - - org.argeo.tp.jetty - org.eclipse.jetty.servlet - - - org.argeo.tp.jetty - org.eclipse.jetty.servlets - - - org.argeo.tp.jetty - org.eclipse.jetty.util - - - org.argeo.tp.jetty - org.eclipse.jetty.xml - - - @@ -266,7 +262,7 @@ - argeo-cms-client${argeo.rpm.suffix} + argeo-cms-minimal{argeo.rpm.suffix} argeo-cms-node-tp${argeo.rpm.suffix} @@ -329,7 +325,7 @@ - argeo-cms-client-tp${argeo.rpm.suffix} + argeo-cms-minimal-tp${argeo.rpm.suffix} diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml index bf645715d..02bf9317c 100644 --- a/dep/org.argeo.dep.cms.ui.rap/pom.xml +++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml @@ -19,6 +19,34 @@ pom + + + + + + + + org.argeo.commons + org.argeo.swt.specific.rap + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.cms.swt + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.cms.ui + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.cms.ui.rap + 2.3-SNAPSHOT + + + org.argeo.tp.rap.e4 @@ -45,33 +73,6 @@ org.eclipse.rap.fileupload - - - org.argeo.commons - org.argeo.eclipse.ui - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.eclipse.ui.rap - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.cms.ui - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.cms.ui.rap - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.cms.ui.theme - 2.3-SNAPSHOT - - org.argeo.tp.sdk diff --git a/dep/pom.xml b/dep/pom.xml index 028b83b65..c91526ccc 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -11,7 +11,7 @@ Commons Modular Distributions pom - org.argeo.dep.cms.client + org.argeo.dep.cms.minimal org.argeo.dep.cms.node org.argeo.dep.cms.ui.rap org.argeo.dep.cms.e4.rap diff --git a/org.argeo.api/pom.xml b/org.argeo.api/pom.xml index efd1bed6b..e8b2b78fd 100644 --- a/org.argeo.api/pom.xml +++ b/org.argeo.api/pom.xml @@ -8,7 +8,7 @@ .. org.argeo.api - Argeo Node API + CMS API jar diff --git a/org.argeo.cms.e4.rap/pom.xml b/org.argeo.cms.e4.rap/pom.xml index 7f5269876..61b47c38f 100644 --- a/org.argeo.cms.e4.rap/pom.xml +++ b/org.argeo.cms.e4.rap/pom.xml @@ -24,7 +24,7 @@ org.argeo.commons - org.argeo.eclipse.ui.rap + org.argeo.swt.specific.rap 2.3-SNAPSHOT provided diff --git a/org.argeo.cms.e4/pom.xml b/org.argeo.cms.e4/pom.xml index ae12564c5..d1c9c50d9 100644 --- a/org.argeo.cms.e4/pom.xml +++ b/org.argeo.cms.e4/pom.xml @@ -20,7 +20,7 @@ org.argeo.commons - org.argeo.eclipse.ui.rap + org.argeo.swt.specific.rap 2.3-SNAPSHOT provided diff --git a/org.argeo.cms.jcr/pom.xml b/org.argeo.cms.jcr/pom.xml index 70c106a30..9191abaf3 100644 --- a/org.argeo.cms.jcr/pom.xml +++ b/org.argeo.cms.jcr/pom.xml @@ -8,23 +8,8 @@ .. org.argeo.cms.jcr - Commons CMS JCR + CMS JCR - - org.argeo.commons - org.argeo.api - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.enterprise - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.core - 2.3-SNAPSHOT - org.argeo.commons org.argeo.cms diff --git a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrCommands.java b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrCommands.java deleted file mode 100644 index ea7467462..000000000 --- a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrCommands.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.argeo.cli.jcr; - -import org.argeo.cli.CommandsCli; - -/** File utilities. */ -public class JcrCommands extends CommandsCli { - - public JcrCommands(String commandName) { - super(commandName); - addCommand("sync", new JcrSync()); - } - - @Override - public String getDescription() { - return "Utilities around remote and local JCR repositories"; - } - -} diff --git a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrSync.java b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrSync.java deleted file mode 100644 index 401f447c9..000000000 --- a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/JcrSync.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.argeo.cli.jcr; - -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.file.Paths; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.jcr.Credentials; -import javax.jcr.Node; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.RepositoryFactory; -import javax.jcr.Session; -import javax.jcr.SimpleCredentials; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.jackrabbit.core.RepositoryImpl; -import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.argeo.cli.CommandArgsException; -import org.argeo.cli.CommandRuntimeException; -import org.argeo.cli.DescribedCommand; -import org.argeo.jackrabbit.client.ClientDavexRepositoryFactory; -import org.argeo.jcr.JcrUtils; -import org.argeo.sync.SyncResult; - -public class JcrSync implements DescribedCommand> { - public final static String DEFAULT_LOCALFS_CONFIG = "repository-localfs.xml"; - - final static Option deleteOption = Option.builder().longOpt("delete").desc("delete from target").build(); - final static Option recursiveOption = Option.builder("r").longOpt("recursive").desc("recurse into directories") - .build(); - final static Option progressOption = Option.builder().longOpt("progress").hasArg(false).desc("show progress") - .build(); - - @Override - public SyncResult apply(List t) { - try { - CommandLine line = toCommandLine(t); - List remaining = line.getArgList(); - if (remaining.size() == 0) { - throw new CommandArgsException("There must be at least one argument"); - } - URI sourceUri = new URI(remaining.get(0)); - URI targetUri; - if (remaining.size() == 1) { - targetUri = Paths.get(System.getProperty("user.dir")).toUri(); - } else { - targetUri = new URI(remaining.get(1)); - } - boolean delete = line.hasOption(deleteOption.getLongOpt()); - boolean recursive = line.hasOption(recursiveOption.getLongOpt()); - - // TODO make it configurable - String sourceWorkspace = "home"; - String targetWorkspace = sourceWorkspace; - - final Repository sourceRepository; - final Session sourceSession; - Credentials sourceCredentials = null; - final Repository targetRepository; - final Session targetSession; - Credentials targetCredentials = null; - - if ("http".equals(sourceUri.getScheme()) || "https".equals(sourceUri.getScheme())) { - sourceRepository = createRemoteRepository(sourceUri); - } else if (null == sourceUri.getScheme() || "file".equals(sourceUri.getScheme())) { - RepositoryConfig repositoryConfig = RepositoryConfig.create( - JcrSync.class.getResourceAsStream(DEFAULT_LOCALFS_CONFIG), sourceUri.getPath().toString()); - sourceRepository = RepositoryImpl.create(repositoryConfig); - sourceCredentials = new SimpleCredentials("admin", "admin".toCharArray()); - } else { - throw new IllegalArgumentException("Unsupported scheme " + sourceUri.getScheme()); - } - sourceSession = JcrUtils.loginOrCreateWorkspace(sourceRepository, sourceWorkspace, sourceCredentials); - - if ("http".equals(targetUri.getScheme()) || "https".equals(targetUri.getScheme())) { - targetRepository = createRemoteRepository(targetUri); - } else if (null == targetUri.getScheme() || "file".equals(targetUri.getScheme())) { - RepositoryConfig repositoryConfig = RepositoryConfig.create( - JcrSync.class.getResourceAsStream(DEFAULT_LOCALFS_CONFIG), targetUri.getPath().toString()); - targetRepository = RepositoryImpl.create(repositoryConfig); - targetCredentials = new SimpleCredentials("admin", "admin".toCharArray()); - } else { - throw new IllegalArgumentException("Unsupported scheme " + targetUri.getScheme()); - } - targetSession = JcrUtils.loginOrCreateWorkspace(targetRepository, targetWorkspace, targetCredentials); - - JcrUtils.copy(sourceSession.getRootNode(), targetSession.getRootNode()); - return new SyncResult(); - } catch (URISyntaxException e) { - throw new CommandArgsException(e); - } catch (Exception e) { - throw new CommandRuntimeException(e, this, t); - } - } - - protected Repository createRemoteRepository(URI uri) throws RepositoryException { - RepositoryFactory repositoryFactory = new ClientDavexRepositoryFactory(); - Map params = new HashMap(); - params.put(ClientDavexRepositoryFactory.JACKRABBIT_DAVEX_URI, uri.toString()); - // FIXME make it configurable - params.put(ClientDavexRepositoryFactory.JACKRABBIT_REMOTE_DEFAULT_WORKSPACE, "sys"); - return repositoryFactory.getRepository(params); - } - - @Override - public Options getOptions() { - Options options = new Options(); - options.addOption(recursiveOption); - options.addOption(deleteOption); - options.addOption(progressOption); - return options; - } - - @Override - public String getUsage() { - return "[source URI] [target URI]"; - } - - public static void main(String[] args) { - DescribedCommand.mainImpl(new JcrSync(), args); - } - - @Override - public String getDescription() { - return "Synchronises JCR repositories"; - } - -} diff --git a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/package-info.java b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/package-info.java deleted file mode 100644 index 6f3f01f3a..000000000 --- a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** JCR CLI commands. */ -package org.argeo.cli.jcr; \ No newline at end of file diff --git a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/repository-localfs.xml b/org.argeo.cms.jcr/src/org/argeo/cli/jcr/repository-localfs.xml deleted file mode 100644 index 5e7759cf4..000000000 --- a/org.argeo.cms.jcr/src/org/argeo/cli/jcr/repository-localfs.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.eclipse.ui.rap/.classpath b/org.argeo.cms.swt/.classpath similarity index 100% rename from org.argeo.eclipse.ui.rap/.classpath rename to org.argeo.cms.swt/.classpath diff --git a/org.argeo.core/.project b/org.argeo.cms.swt/.project similarity index 95% rename from org.argeo.core/.project rename to org.argeo.cms.swt/.project index cb3127eb8..082112e6d 100644 --- a/org.argeo.core/.project +++ b/org.argeo.cms.swt/.project @@ -1,6 +1,6 @@ - org.argeo.core + org.argeo.cms.swt diff --git a/org.argeo.cms.ui.theme/META-INF/.gitignore b/org.argeo.cms.swt/META-INF/.gitignore similarity index 100% rename from org.argeo.cms.ui.theme/META-INF/.gitignore rename to org.argeo.cms.swt/META-INF/.gitignore diff --git a/org.argeo.eclipse.ui/bnd.bnd b/org.argeo.cms.swt/bnd.bnd similarity index 100% rename from org.argeo.eclipse.ui/bnd.bnd rename to org.argeo.cms.swt/bnd.bnd diff --git a/org.argeo.eclipse.ui/build.properties b/org.argeo.cms.swt/build.properties similarity index 100% rename from org.argeo.eclipse.ui/build.properties rename to org.argeo.cms.swt/build.properties diff --git a/org.argeo.cms.ui.theme/icons/actions/add.png b/org.argeo.cms.swt/icons/actions/add.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/actions/add.png rename to org.argeo.cms.swt/icons/actions/add.png diff --git a/org.argeo.cms.ui.theme/icons/actions/close-all.png b/org.argeo.cms.swt/icons/actions/close-all.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/actions/close-all.png rename to org.argeo.cms.swt/icons/actions/close-all.png diff --git a/org.argeo.cms.ui.theme/icons/actions/delete.png b/org.argeo.cms.swt/icons/actions/delete.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/actions/delete.png rename to org.argeo.cms.swt/icons/actions/delete.png diff --git a/org.argeo.cms.ui.theme/icons/actions/edit.png b/org.argeo.cms.swt/icons/actions/edit.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/actions/edit.png rename to org.argeo.cms.swt/icons/actions/edit.png diff --git a/org.argeo.cms.ui.theme/icons/actions/save-all.png b/org.argeo.cms.swt/icons/actions/save-all.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/actions/save-all.png rename to org.argeo.cms.swt/icons/actions/save-all.png diff --git a/org.argeo.cms.ui.theme/icons/actions/save.png b/org.argeo.cms.swt/icons/actions/save.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/actions/save.png rename to org.argeo.cms.swt/icons/actions/save.png diff --git a/org.argeo.cms.ui.theme/icons/active.gif b/org.argeo.cms.swt/icons/active.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/active.gif rename to org.argeo.cms.swt/icons/active.gif diff --git a/org.argeo.cms.ui.theme/icons/add.gif b/org.argeo.cms.swt/icons/add.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/add.gif rename to org.argeo.cms.swt/icons/add.gif diff --git a/org.argeo.cms.ui.theme/icons/add.png b/org.argeo.cms.swt/icons/add.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/add.png rename to org.argeo.cms.swt/icons/add.png diff --git a/org.argeo.cms.ui.theme/icons/addFolder.gif b/org.argeo.cms.swt/icons/addFolder.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/addFolder.gif rename to org.argeo.cms.swt/icons/addFolder.gif diff --git a/org.argeo.cms.ui.theme/icons/addPrivileges.gif b/org.argeo.cms.swt/icons/addPrivileges.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/addPrivileges.gif rename to org.argeo.cms.swt/icons/addPrivileges.gif diff --git a/org.argeo.cms.ui.theme/icons/addRepo.gif b/org.argeo.cms.swt/icons/addRepo.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/addRepo.gif rename to org.argeo.cms.swt/icons/addRepo.gif diff --git a/org.argeo.cms.ui.theme/icons/addWorkspace.png b/org.argeo.cms.swt/icons/addWorkspace.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/addWorkspace.png rename to org.argeo.cms.swt/icons/addWorkspace.png diff --git a/org.argeo.cms.ui.theme/icons/adminLog.gif b/org.argeo.cms.swt/icons/adminLog.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/adminLog.gif rename to org.argeo.cms.swt/icons/adminLog.gif diff --git a/org.argeo.cms.ui.theme/icons/batch.gif b/org.argeo.cms.swt/icons/batch.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/batch.gif rename to org.argeo.cms.swt/icons/batch.gif diff --git a/org.argeo.cms.ui.theme/icons/begin.gif b/org.argeo.cms.swt/icons/begin.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/begin.gif rename to org.argeo.cms.swt/icons/begin.gif diff --git a/org.argeo.cms.ui.theme/icons/binary.png b/org.argeo.cms.swt/icons/binary.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/binary.png rename to org.argeo.cms.swt/icons/binary.png diff --git a/org.argeo.cms.ui.theme/icons/browser.gif b/org.argeo.cms.swt/icons/browser.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/browser.gif rename to org.argeo.cms.swt/icons/browser.gif diff --git a/org.argeo.cms.ui.theme/icons/bundles.gif b/org.argeo.cms.swt/icons/bundles.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/bundles.gif rename to org.argeo.cms.swt/icons/bundles.gif diff --git a/org.argeo.cms.ui.theme/icons/changePassword.gif b/org.argeo.cms.swt/icons/changePassword.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/changePassword.gif rename to org.argeo.cms.swt/icons/changePassword.gif diff --git a/org.argeo.cms.ui.theme/icons/clear.gif b/org.argeo.cms.swt/icons/clear.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/clear.gif rename to org.argeo.cms.swt/icons/clear.gif diff --git a/org.argeo.cms.ui.theme/icons/close-all.png b/org.argeo.cms.swt/icons/close-all.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/close-all.png rename to org.argeo.cms.swt/icons/close-all.png diff --git a/org.argeo.cms.ui.theme/icons/commit.gif b/org.argeo.cms.swt/icons/commit.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/commit.gif rename to org.argeo.cms.swt/icons/commit.gif diff --git a/org.argeo.cms.ui.theme/icons/delete.png b/org.argeo.cms.swt/icons/delete.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/delete.png rename to org.argeo.cms.swt/icons/delete.png diff --git a/org.argeo.cms.ui.theme/icons/dumpNode.gif b/org.argeo.cms.swt/icons/dumpNode.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/dumpNode.gif rename to org.argeo.cms.swt/icons/dumpNode.gif diff --git a/org.argeo.cms.ui.theme/icons/file.gif b/org.argeo.cms.swt/icons/file.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/file.gif rename to org.argeo.cms.swt/icons/file.gif diff --git a/org.argeo.cms.ui.theme/icons/folder.gif b/org.argeo.cms.swt/icons/folder.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/folder.gif rename to org.argeo.cms.swt/icons/folder.gif diff --git a/org.argeo.cms.ui.theme/icons/getSize.gif b/org.argeo.cms.swt/icons/getSize.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/getSize.gif rename to org.argeo.cms.swt/icons/getSize.gif diff --git a/org.argeo.cms.ui.theme/icons/group.png b/org.argeo.cms.swt/icons/group.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/group.png rename to org.argeo.cms.swt/icons/group.png diff --git a/org.argeo.cms.ui.theme/icons/home.gif b/org.argeo.cms.swt/icons/home.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/home.gif rename to org.argeo.cms.swt/icons/home.gif diff --git a/org.argeo.cms.ui.theme/icons/home.png b/org.argeo.cms.swt/icons/home.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/home.png rename to org.argeo.cms.swt/icons/home.png diff --git a/org.argeo.cms.ui.theme/icons/import_fs.png b/org.argeo.cms.swt/icons/import_fs.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/import_fs.png rename to org.argeo.cms.swt/icons/import_fs.png diff --git a/org.argeo.cms.ui.theme/icons/installed.gif b/org.argeo.cms.swt/icons/installed.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/installed.gif rename to org.argeo.cms.swt/icons/installed.gif diff --git a/org.argeo.cms.ui.theme/icons/log.gif b/org.argeo.cms.swt/icons/log.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/log.gif rename to org.argeo.cms.swt/icons/log.gif diff --git a/org.argeo.cms.ui.theme/icons/logout.png b/org.argeo.cms.swt/icons/logout.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/logout.png rename to org.argeo.cms.swt/icons/logout.png diff --git a/org.argeo.cms.ui.theme/icons/maintenance.gif b/org.argeo.cms.swt/icons/maintenance.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/maintenance.gif rename to org.argeo.cms.swt/icons/maintenance.gif diff --git a/org.argeo.cms.ui.theme/icons/node.gif b/org.argeo.cms.swt/icons/node.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/node.gif rename to org.argeo.cms.swt/icons/node.gif diff --git a/org.argeo.cms.ui.theme/icons/nodes.gif b/org.argeo.cms.swt/icons/nodes.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/nodes.gif rename to org.argeo.cms.swt/icons/nodes.gif diff --git a/org.argeo.cms.ui.theme/icons/osgi_explorer.gif b/org.argeo.cms.swt/icons/osgi_explorer.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/osgi_explorer.gif rename to org.argeo.cms.swt/icons/osgi_explorer.gif diff --git a/org.argeo.cms.ui.theme/icons/password.gif b/org.argeo.cms.swt/icons/password.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/password.gif rename to org.argeo.cms.swt/icons/password.gif diff --git a/org.argeo.cms.ui.theme/icons/person-logged-in.png b/org.argeo.cms.swt/icons/person-logged-in.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/person-logged-in.png rename to org.argeo.cms.swt/icons/person-logged-in.png diff --git a/org.argeo.cms.ui.theme/icons/person.png b/org.argeo.cms.swt/icons/person.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/person.png rename to org.argeo.cms.swt/icons/person.png diff --git a/org.argeo.cms.ui.theme/icons/query.png b/org.argeo.cms.swt/icons/query.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/query.png rename to org.argeo.cms.swt/icons/query.png diff --git a/org.argeo.cms.ui.theme/icons/refresh.png b/org.argeo.cms.swt/icons/refresh.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/refresh.png rename to org.argeo.cms.swt/icons/refresh.png diff --git a/org.argeo.cms.ui.theme/icons/remote_connected.gif b/org.argeo.cms.swt/icons/remote_connected.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/remote_connected.gif rename to org.argeo.cms.swt/icons/remote_connected.gif diff --git a/org.argeo.cms.ui.theme/icons/remote_disconnected.gif b/org.argeo.cms.swt/icons/remote_disconnected.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/remote_disconnected.gif rename to org.argeo.cms.swt/icons/remote_disconnected.gif diff --git a/org.argeo.cms.ui.theme/icons/remove.gif b/org.argeo.cms.swt/icons/remove.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/remove.gif rename to org.argeo.cms.swt/icons/remove.gif diff --git a/org.argeo.cms.ui.theme/icons/removePrivileges.gif b/org.argeo.cms.swt/icons/removePrivileges.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/removePrivileges.gif rename to org.argeo.cms.swt/icons/removePrivileges.gif diff --git a/org.argeo.cms.ui.theme/icons/rename.gif b/org.argeo.cms.swt/icons/rename.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/rename.gif rename to org.argeo.cms.swt/icons/rename.gif diff --git a/org.argeo.cms.ui.theme/icons/repositories.gif b/org.argeo.cms.swt/icons/repositories.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/repositories.gif rename to org.argeo.cms.swt/icons/repositories.gif diff --git a/org.argeo.cms.ui.theme/icons/repository_connected.gif b/org.argeo.cms.swt/icons/repository_connected.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/repository_connected.gif rename to org.argeo.cms.swt/icons/repository_connected.gif diff --git a/org.argeo.cms.ui.theme/icons/repository_disconnected.gif b/org.argeo.cms.swt/icons/repository_disconnected.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/repository_disconnected.gif rename to org.argeo.cms.swt/icons/repository_disconnected.gif diff --git a/org.argeo.cms.ui.theme/icons/resolved.gif b/org.argeo.cms.swt/icons/resolved.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/resolved.gif rename to org.argeo.cms.swt/icons/resolved.gif diff --git a/org.argeo.cms.ui.theme/icons/role.gif b/org.argeo.cms.swt/icons/role.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/role.gif rename to org.argeo.cms.swt/icons/role.gif diff --git a/org.argeo.cms.ui.theme/icons/rollback.gif b/org.argeo.cms.swt/icons/rollback.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/rollback.gif rename to org.argeo.cms.swt/icons/rollback.gif diff --git a/org.argeo.cms.ui.theme/icons/save-all.png b/org.argeo.cms.swt/icons/save-all.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/save-all.png rename to org.argeo.cms.swt/icons/save-all.png diff --git a/org.argeo.cms.ui.theme/icons/save.gif b/org.argeo.cms.swt/icons/save.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/save.gif rename to org.argeo.cms.swt/icons/save.gif diff --git a/org.argeo.cms.ui.theme/icons/save.png b/org.argeo.cms.swt/icons/save.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/save.png rename to org.argeo.cms.swt/icons/save.png diff --git a/org.argeo.cms.ui.theme/icons/save_security.png b/org.argeo.cms.swt/icons/save_security.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/save_security.png rename to org.argeo.cms.swt/icons/save_security.png diff --git a/org.argeo.cms.ui.theme/icons/save_security_disabled.png b/org.argeo.cms.swt/icons/save_security_disabled.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/save_security_disabled.png rename to org.argeo.cms.swt/icons/save_security_disabled.png diff --git a/org.argeo.cms.ui.theme/icons/security.gif b/org.argeo.cms.swt/icons/security.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/security.gif rename to org.argeo.cms.swt/icons/security.gif diff --git a/org.argeo.cms.ui.theme/icons/service_published.gif b/org.argeo.cms.swt/icons/service_published.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/service_published.gif rename to org.argeo.cms.swt/icons/service_published.gif diff --git a/org.argeo.cms.ui.theme/icons/service_referenced.gif b/org.argeo.cms.swt/icons/service_referenced.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/service_referenced.gif rename to org.argeo.cms.swt/icons/service_referenced.gif diff --git a/org.argeo.cms.ui.theme/icons/sort.gif b/org.argeo.cms.swt/icons/sort.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/sort.gif rename to org.argeo.cms.swt/icons/sort.gif diff --git a/org.argeo.cms.ui.theme/icons/starting.gif b/org.argeo.cms.swt/icons/starting.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/starting.gif rename to org.argeo.cms.swt/icons/starting.gif diff --git a/org.argeo.cms.ui.theme/icons/sync.gif b/org.argeo.cms.swt/icons/sync.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/sync.gif rename to org.argeo.cms.swt/icons/sync.gif diff --git a/org.argeo.cms.ui.theme/icons/user.gif b/org.argeo.cms.swt/icons/user.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/user.gif rename to org.argeo.cms.swt/icons/user.gif diff --git a/org.argeo.cms.ui.theme/icons/users.gif b/org.argeo.cms.swt/icons/users.gif similarity index 100% rename from org.argeo.cms.ui.theme/icons/users.gif rename to org.argeo.cms.swt/icons/users.gif diff --git a/org.argeo.cms.ui.theme/icons/workgroup.png b/org.argeo.cms.swt/icons/workgroup.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/workgroup.png rename to org.argeo.cms.swt/icons/workgroup.png diff --git a/org.argeo.cms.ui.theme/icons/workgroup.xcf b/org.argeo.cms.swt/icons/workgroup.xcf similarity index 100% rename from org.argeo.cms.ui.theme/icons/workgroup.xcf rename to org.argeo.cms.swt/icons/workgroup.xcf diff --git a/org.argeo.cms.ui.theme/icons/workspace_connected.png b/org.argeo.cms.swt/icons/workspace_connected.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/workspace_connected.png rename to org.argeo.cms.swt/icons/workspace_connected.png diff --git a/org.argeo.cms.ui.theme/icons/workspace_disconnected.png b/org.argeo.cms.swt/icons/workspace_disconnected.png similarity index 100% rename from org.argeo.cms.ui.theme/icons/workspace_disconnected.png rename to org.argeo.cms.swt/icons/workspace_disconnected.png diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.cms.swt/pom.xml similarity index 90% rename from org.argeo.eclipse.ui/pom.xml rename to org.argeo.cms.swt/pom.xml index 9a97ad070..2e3942000 100644 --- a/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.cms.swt/pom.xml @@ -7,8 +7,8 @@ argeo-commons .. - org.argeo.eclipse.ui - Commons Eclipse UI + org.argeo.cms.swt + CMS SWT @@ -17,7 +17,7 @@ org.argeo.commons - org.argeo.cms.jcr + org.argeo.cms 2.3-SNAPSHOT diff --git a/org.argeo.cms.ui.theme/src/org/argeo/cms/ui/theme/CmsImages.java b/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java similarity index 100% rename from org.argeo.cms.ui.theme/src/org/argeo/cms/ui/theme/CmsImages.java rename to org.argeo.cms.swt/src/org/argeo/cms/ui/theme/CmsImages.java diff --git a/org.argeo.cms.ui.theme/src/org/argeo/cms/ui/theme/package-info.java b/org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java similarity index 100% rename from org.argeo.cms.ui.theme/src/org/argeo/cms/ui/theme/package-info.java rename to org.argeo.cms.swt/src/org/argeo/cms/ui/theme/package-info.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnDefinition.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnDefinition.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnDefinition.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnViewerComparator.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnViewerComparator.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/ColumnViewerComparator.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiException.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiException.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiException.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiUtils.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiUtils.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/EclipseUiUtils.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/FileProvider.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/FileProvider.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/FileProvider.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/GenericTableComparator.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/GenericTableComparator.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/GenericTableComparator.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/IListProvider.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/IListProvider.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/IListProvider.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/MouseDoubleClick.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/MouseDoubleClick.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/MouseDoubleClick.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/MouseDoubleClick.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/MouseDown.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/MouseDown.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/MouseDown.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/MouseDown.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/Selected.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/Selected.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/Selected.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/Selected.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/TreeParent.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/TreeParent.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/TreeParent.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/TreeParent.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/ErrorFeedback.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/FeedbackDialog.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/SingleValue.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/SingleValue.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/SingleValue.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/package-info.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/package-info.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/dialogs/package-info.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/AdvancedFsBrowser.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTableViewer.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsTreeViewer.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsUiConstants.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsUiConstants.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiConstants.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsUiException.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsUiException.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiException.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsUiUtils.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsUiUtils.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/FsUiUtils.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/ParentDir.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/ParentDir.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/ParentDir.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsBrowser.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/SimpleFsTreeBrowser.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/file.png b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/file.png rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/file.png diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/folder.png b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/folder.png rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/folder.png diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/package-info.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/package-info.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/fs/package-info.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/package-info.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/package-info.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/package-info.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/package-info.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/package-info.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/parts/package-info.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/ViewerUtils.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/ViewerUtils.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/ViewerUtils.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/package-info.java b/org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/package-info.java rename to org.argeo.cms.swt/src/org/argeo/eclipse/ui/util/package-info.java diff --git a/org.argeo.cms.ui.rap/bnd.bnd b/org.argeo.cms.ui.rap/bnd.bnd index 8ac12f02f..30b21b019 100644 --- a/org.argeo.cms.ui.rap/bnd.bnd +++ b/org.argeo.cms.ui.rap/bnd.bnd @@ -5,4 +5,11 @@ org.argeo.eclipse.ui,\ javax.jcr.nodetype,\ javax.jcr.security,\ org.eclipse.swt.graphics,\ +org.eclipse.jetty.util.component;resolution:=optional,\ +org.eclipse.jetty.http;resolution:=optional,\ +org.eclipse.jetty.io;resolution:=optional,\ +org.eclipse.jetty.security;resolution:=optional,\ +org.eclipse.jetty.server.handler;resolution:=optional,\ +org.eclipse.jetty.*;resolution:=optional,\ * + diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml index b38871cc2..243d2c441 100644 --- a/org.argeo.cms.ui.rap/pom.xml +++ b/org.argeo.cms.ui.rap/pom.xml @@ -19,18 +19,11 @@ org.argeo.commons - org.argeo.eclipse.ui.rap + org.argeo.swt.specific.rap 2.3-SNAPSHOT provided - - - org.argeo.commons - org.argeo.cms.ui.theme - 2.3-SNAPSHOT - - org.argeo.tp.rap.e4 diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java b/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java similarity index 100% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java rename to org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java diff --git a/org.argeo.cms.ui.theme/.classpath b/org.argeo.cms.ui.theme/.classpath deleted file mode 100644 index e801ebfb4..000000000 --- a/org.argeo.cms.ui.theme/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.argeo.cms.ui.theme/.project b/org.argeo.cms.ui.theme/.project deleted file mode 100644 index 5f900214b..000000000 --- a/org.argeo.cms.ui.theme/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.cms.ui.theme - - - - - - 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.cms.ui.theme/bnd.bnd b/org.argeo.cms.ui.theme/bnd.bnd deleted file mode 100644 index 2b2a02fac..000000000 --- a/org.argeo.cms.ui.theme/bnd.bnd +++ /dev/null @@ -1 +0,0 @@ -Bundle-ActivationPolicy: lazy diff --git a/org.argeo.cms.ui.theme/build.properties b/org.argeo.cms.ui.theme/build.properties deleted file mode 100644 index 34d2e4d2d..000000000 --- a/org.argeo.cms.ui.theme/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/org.argeo.cms.ui.theme/pom.xml b/org.argeo.cms.ui.theme/pom.xml deleted file mode 100644 index be47b820a..000000000 --- a/org.argeo.cms.ui.theme/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - argeo-commons - 2.3-SNAPSHOT - .. - - org.argeo.cms.ui.theme - CMS UI Theme - jar - - - - org.argeo.tp.rap.e4 - org.eclipse.rap.rwt - provided - - - org.argeo.tp.rap.e4 - org.eclipse.rap.jface - provided - - - - \ No newline at end of file diff --git a/org.argeo.cms.ui.theme/rap/argeo-studio.css b/org.argeo.cms.ui.theme/rap/argeo-studio.css deleted file mode 100644 index 2d7555570..000000000 --- a/org.argeo.cms.ui.theme/rap/argeo-studio.css +++ /dev/null @@ -1,21 +0,0 @@ -Composite.qa { - background-color: gray; - color: white; -} - -Button[PUSH].qa { - color: white; - background-color: gray; - padding: 0px; - spacing: 0px; - border: none; -} - -Composite.support { - background-color: red; -} - -Label.support { - background-color: red; - color: white; -} diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml index d2dd775e0..84ff17e94 100644 --- a/org.argeo.cms.ui/pom.xml +++ b/org.argeo.cms.ui/pom.xml @@ -18,22 +18,20 @@ org.argeo.commons - org.argeo.cms.jcr + org.argeo.cms.swt 2.3-SNAPSHOT - org.argeo.commons - org.argeo.eclipse.ui.rap + org.argeo.cms.jcr 2.3-SNAPSHOT - provided - - + org.argeo.commons - org.argeo.cms.ui.theme + org.argeo.swt.specific.rap 2.3-SNAPSHOT + provided diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 0d85713dd..d30d45e2e 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -21,11 +21,11 @@ org.argeo.enterprise 2.3-SNAPSHOT - - org.argeo.commons - org.argeo.core - 2.3-SNAPSHOT - + + + + + diff --git a/org.argeo.cms/src/org/argeo/cms/cli/ArgeoCli.java b/org.argeo.cms/src/org/argeo/cms/cli/ArgeoCli.java deleted file mode 100644 index b8eafca86..000000000 --- a/org.argeo.cms/src/org/argeo/cms/cli/ArgeoCli.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.argeo.cms.cli; - -import org.apache.commons.cli.Option; -import org.argeo.cli.CommandsCli; -import org.argeo.cli.fs.FsCommands; -import org.argeo.cli.posix.PosixCommands; - -/** Argeo command line tools. */ -public class ArgeoCli extends CommandsCli { - - public ArgeoCli(String commandName) { - super(commandName); - // Common options - options.addOption(Option.builder("v").hasArg().argName("verbose").desc("verbosity").build()); - options.addOption( - Option.builder("D").hasArgs().argName("property=value").desc("use value for given property").build()); - - addCommandsCli(new PosixCommands("posix")); - addCommandsCli(new FsCommands("fs")); -// addCommandsCli(new JcrCommands("jcr")); - } - - @Override - public String getDescription() { - return "Argeo command line utilities"; - } - - public static void main(String[] args) { - mainImpl(new ArgeoCli("argeo"), args); - } - -} 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 078da9af8..000000000 --- a/org.argeo.cms/src/org/argeo/cms/cli/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Argeo command line interface. */ -package org.argeo.cms.cli; \ No newline at end of file diff --git a/org.argeo.core/.classpath b/org.argeo.core/.classpath deleted file mode 100644 index 9a0a269a2..000000000 --- a/org.argeo.core/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/org.argeo.core/bnd.bnd b/org.argeo.core/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.core/build.properties b/org.argeo.core/build.properties deleted file mode 100644 index 353d0422a..000000000 --- a/org.argeo.core/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - ext/test/ -output.. = bin/ -bin.includes = META-INF/,\ - . - \ No newline at end of file diff --git a/org.argeo.core/ext/test/log4j.properties b/org.argeo.core/ext/test/log4j.properties deleted file mode 100644 index 3d7528963..000000000 --- a/org.argeo.core/ext/test/log4j.properties +++ /dev/null @@ -1,14 +0,0 @@ -log4j.rootLogger=WARN, console - -## Levels -log4j.logger.org.argeo=DEBUG -log4j.logger.org.apache.jackrabbit=OFF - -## Appenders -# console is set to be a ConsoleAppender. -log4j.appender.console=org.apache.log4j.ConsoleAppender - -# console uses PatternLayout. -log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n -log4j.appender.console.layout.ConversionPattern=%m%n diff --git a/org.argeo.core/ext/test/org/argeo/fs/FsUtilsTest.java b/org.argeo.core/ext/test/org/argeo/fs/FsUtilsTest.java deleted file mode 100644 index 793216b1d..000000000 --- a/org.argeo.core/ext/test/org/argeo/fs/FsUtilsTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.argeo.fs; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** {@link FsUtils} tests. */ -public class FsUtilsTest { - final static String FILE00 = "file00"; - final static String FILE01 = "file01"; - final static String SUB_DIR = "subDir"; - - public void testDelete() throws IOException { - Path dir = createDir00(); - assert Files.exists(dir); - FsUtils.delete(dir); - assert !Files.exists(dir); - } - - public void testSync() throws IOException { - Path source = createDir00(); - Path target = Files.createTempDirectory(getClass().getName()); - FsUtils.sync(source, target); - assert Files.exists(target.resolve(FILE00)); - assert Files.exists(target.resolve(SUB_DIR)); - assert Files.exists(target.resolve(SUB_DIR + File.separator + FILE01)); - FsUtils.delete(source.resolve(SUB_DIR)); - FsUtils.sync(source, target, true); - assert Files.exists(target.resolve(FILE00)); - assert !Files.exists(target.resolve(SUB_DIR)); - assert !Files.exists(target.resolve(SUB_DIR + File.separator + FILE01)); - - // clean up - FsUtils.delete(source); - FsUtils.delete(target); - - } - - Path createDir00() throws IOException { - Path base = Files.createTempDirectory(getClass().getName()); - base.toFile().deleteOnExit(); - Files.createFile(base.resolve(FILE00)).toFile().deleteOnExit(); - Path subDir = Files.createDirectories(base.resolve(SUB_DIR)); - subDir.toFile().deleteOnExit(); - Files.createFile(subDir.resolve(FILE01)).toFile().deleteOnExit(); - return base; - } -} diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml deleted file mode 100644 index ad5afd468..000000000 --- a/org.argeo.core/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - argeo-commons - 2.3-SNAPSHOT - .. - - org.argeo.core - Commons Third Parties Utilities - - - org.argeo.commons - org.argeo.enterprise - 2.3-SNAPSHOT - - - - - - - - \ No newline at end of file diff --git a/org.argeo.core/src/org/argeo/cli/CommandArgsException.java b/org.argeo.core/src/org/argeo/cli/CommandArgsException.java deleted file mode 100644 index d7a615a8e..000000000 --- a/org.argeo.core/src/org/argeo/cli/CommandArgsException.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.argeo.cli; - -public class CommandArgsException extends IllegalArgumentException { - private static final long serialVersionUID = -7271050747105253935L; - private String commandName; - private volatile CommandsCli commandsCli; - - public CommandArgsException(Exception cause) { - super(cause.getMessage(), cause); - } - - public CommandArgsException(String message) { - super(message); - } - - public String getCommandName() { - return commandName; - } - - public void setCommandName(String commandName) { - this.commandName = commandName; - } - - public CommandsCli getCommandsCli() { - return commandsCli; - } - - public void setCommandsCli(CommandsCli commandsCli) { - this.commandsCli = commandsCli; - } - -} diff --git a/org.argeo.core/src/org/argeo/cli/CommandRuntimeException.java b/org.argeo.core/src/org/argeo/cli/CommandRuntimeException.java deleted file mode 100644 index 68b9a18cf..000000000 --- a/org.argeo.core/src/org/argeo/cli/CommandRuntimeException.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.argeo.cli; - -import java.util.List; - -/** {@link RuntimeException} referring during a command run. */ -public class CommandRuntimeException extends RuntimeException { - private static final long serialVersionUID = 5595999301269377128L; - - private final DescribedCommand command; - private final List arguments; - - public CommandRuntimeException(Throwable e, DescribedCommand command, List arguments) { - this(null, e, command, arguments); - } - - public CommandRuntimeException(String message, DescribedCommand command, List arguments) { - this(message, null, command, arguments); - } - - public CommandRuntimeException(String message, Throwable e, DescribedCommand command, List arguments) { - super(message == null ? "(" + command.getClass().getName() + " " + arguments.toString() + ")" - : message + " (" + command.getClass().getName() + " " + arguments.toString() + ")", e); - this.command = command; - this.arguments = arguments; - } - - public DescribedCommand getCommand() { - return command; - } - - public List getArguments() { - return arguments; - } - -} diff --git a/org.argeo.core/src/org/argeo/cli/CommandsCli.java b/org.argeo.core/src/org/argeo/cli/CommandsCli.java deleted file mode 100644 index b0879f0a4..000000000 --- a/org.argeo.core/src/org/argeo/cli/CommandsCli.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.argeo.cli; - -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.function.Function; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; - -/** Base class for a CLI managing sub commands. */ -public abstract class CommandsCli implements DescribedCommand { - public final static String HELP = "help"; - - private final String commandName; - private Map, ?>> commands = new TreeMap<>(); - - protected final Options options = new Options(); - - public CommandsCli(String commandName) { - this.commandName = commandName; - } - - @Override - public Object apply(List args) { - String cmd = null; - List newArgs = new ArrayList<>(); - try { - CommandLineParser clParser = new DefaultParser(); - CommandLine commonCl = clParser.parse(getOptions(), args.toArray(new String[args.size()]), true); - List leftOvers = commonCl.getArgList(); - for (String arg : leftOvers) { - if (!arg.startsWith("-") && cmd == null) { - cmd = arg; - } else { - newArgs.add(arg); - } - } - } catch (ParseException e) { - CommandArgsException cae = new CommandArgsException(e); - throw cae; - } - - Function, ?> function = cmd != null ? getCommand(cmd) : getDefaultCommand(); - if (function == null) - throw new IllegalArgumentException("Uknown command " + cmd); - try { - return function.apply(newArgs).toString(); - } catch (CommandArgsException e) { - if (e.getCommandName() == null) { - e.setCommandName(cmd); - e.setCommandsCli(this); - } - throw e; - } catch (IllegalArgumentException e) { - CommandArgsException cae = new CommandArgsException(e); - cae.setCommandName(cmd); - throw cae; - } - } - - @Override - public Options getOptions() { - return options; - } - - protected void addCommand(String cmd, Function, ?> function) { - commands.put(cmd, function); - - } - - @Override - public String getUsage() { - return "[command]"; - } - - protected void addCommandsCli(CommandsCli commandsCli) { - addCommand(commandsCli.getCommandName(), commandsCli); - commandsCli.addCommand(HELP, new HelpCommand(this, commandsCli)); - } - - public String getCommandName() { - return commandName; - } - - public Set getSubCommands() { - return commands.keySet(); - } - - public Function, ?> getCommand(String command) { - return commands.get(command); - } - - public HelpCommand getHelpCommand() { - return (HelpCommand) getCommand(HELP); - } - - public Function, String> getDefaultCommand() { - return getHelpCommand(); - } - - /** In order to implement quickly a main method. */ - public static void mainImpl(CommandsCli cli, String[] args) { - try { - cli.addCommand(CommandsCli.HELP, new HelpCommand(null, cli)); - Object output = cli.apply(Arrays.asList(args)); - System.out.println(output); - System.exit(0); - } catch (CommandArgsException e) { - System.err.println("Wrong arguments " + Arrays.toString(args) + ": " + e.getMessage()); - if (e.getCommandName() != null) { - StringWriter out = new StringWriter(); - HelpCommand.printHelp(e.getCommandsCli(), e.getCommandName(), out); - System.err.println(out.toString()); - } else { - e.printStackTrace(); - } - System.exit(1); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } -} diff --git a/org.argeo.core/src/org/argeo/cli/DescribedCommand.java b/org.argeo.core/src/org/argeo/cli/DescribedCommand.java deleted file mode 100644 index 9587206b8..000000000 --- a/org.argeo.core/src/org/argeo/cli/DescribedCommand.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.argeo.cli; - -import java.io.StringWriter; -import java.util.Arrays; -import java.util.List; -import java.util.function.Function; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; - -/** A command that can be described. */ -public interface DescribedCommand extends Function, T> { - default Options getOptions() { - return new Options(); - } - - String getDescription(); - - default String getUsage() { - return null; - } - - default String getExamples() { - return null; - } - - default CommandLine toCommandLine(List args) { - try { - DefaultParser parser = new DefaultParser(); - return parser.parse(getOptions(), args.toArray(new String[args.size()])); - } catch (ParseException e) { - throw new CommandArgsException(e); - } - } - - /** In order to implement quickly a main method. */ - public static void mainImpl(DescribedCommand command, String[] args) { - try { - Object output = command.apply(Arrays.asList(args)); - System.out.println(output); - System.exit(0); - } catch (IllegalArgumentException e) { - StringWriter out = new StringWriter(); - HelpCommand.printHelp(command, out); - System.err.println(out.toString()); - System.exit(1); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - -} diff --git a/org.argeo.core/src/org/argeo/cli/HelpCommand.java b/org.argeo.core/src/org/argeo/cli/HelpCommand.java deleted file mode 100644 index 755ce599e..000000000 --- a/org.argeo.core/src/org/argeo/cli/HelpCommand.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.argeo.cli; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; -import java.util.function.Function; - -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; - -/** A special command that can describe {@link DescribedCommand}. */ -public class HelpCommand implements DescribedCommand { - private CommandsCli commandsCli; - private CommandsCli parentCommandsCli; - - // Help formatting - private static int helpWidth = 80; - private static int helpLeftPad = 4; - private static int helpDescPad = 20; - - public HelpCommand(CommandsCli parentCommandsCli, CommandsCli commandsCli) { - super(); - this.parentCommandsCli = parentCommandsCli; - this.commandsCli = commandsCli; - } - - @Override - public String apply(List args) { - StringWriter out = new StringWriter(); - - if (args.size() == 0) {// overview - printHelp(commandsCli, out); - } else { - String cmd = args.get(0); - Function, ?> function = commandsCli.getCommand(cmd); - if (function == null) - return "Command " + cmd + " not found."; - Options options; - String examples; - DescribedCommand command = null; - if (function instanceof DescribedCommand) { - command = (DescribedCommand) function; - options = command.getOptions(); - examples = command.getExamples(); - } else { - options = new Options(); - examples = null; - } - String description = getShortDescription(function); - String commandCall = getCommandUsage(cmd, command); - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(new PrintWriter(out), helpWidth, commandCall, description, options, helpLeftPad, - helpDescPad, examples, false); - } - return out.toString(); - } - - private static String getShortDescription(Function, ?> function) { - if (function instanceof DescribedCommand) { - return ((DescribedCommand) function).getDescription(); - } else { - return function.toString(); - } - } - - public String getCommandUsage(String cmd, DescribedCommand command) { - String commandCall = getCommandCall(commandsCli) + " " + cmd; - assert command != null; - if (command != null && command.getUsage() != null) { - commandCall = commandCall + " " + command.getUsage(); - } - return commandCall; - } - - @Override - public String getDescription() { - return "Shows this help or describes a command"; - } - - @Override - public String getUsage() { - return "[command]"; - } - - public CommandsCli getParentCommandsCli() { - return parentCommandsCli; - } - - protected String getCommandCall(CommandsCli commandsCli) { - HelpCommand hc = commandsCli.getHelpCommand(); - if (hc.getParentCommandsCli() != null) { - return getCommandCall(hc.getParentCommandsCli()) + " " + commandsCli.getCommandName(); - } else { - return commandsCli.getCommandName(); - } - } - - public static void printHelp(DescribedCommand command, StringWriter out) { - String usage = "java " + command.getClass().getName() - + (command.getUsage() != null ? " " + command.getUsage() : ""); - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(new PrintWriter(out), helpWidth, usage, command.getDescription(), command.getOptions(), - helpLeftPad, helpDescPad, command.getExamples(), false); - - } - - public static void printHelp(CommandsCli commandsCli, String commandName, StringWriter out) { - DescribedCommand command = (DescribedCommand) commandsCli.getCommand(commandName); - String usage = commandsCli.getHelpCommand().getCommandUsage(commandName, command); - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(new PrintWriter(out), helpWidth, usage, command.getDescription(), command.getOptions(), - helpLeftPad, helpDescPad, command.getExamples(), false); - - } - - public static void printHelp(CommandsCli commandsCli, StringWriter out) { - out.append(commandsCli.getDescription()).append('\n'); - String leftPad = spaces(helpLeftPad); - for (String cmd : commandsCli.getSubCommands()) { - Function, ?> function = commandsCli.getCommand(cmd); - assert function != null; - out.append(leftPad); - out.append(cmd); - // TODO deal with long commands - out.append(spaces(helpDescPad - cmd.length())); - out.append(getShortDescription(function)); - out.append('\n'); - } - } - - private static String spaces(int count) { - // Java 11 - // return " ".repeat(count); - if (count <= 0) - return ""; - else { - StringBuilder sb = new StringBuilder(count); - for (int i = 0; i < count; i++) - sb.append(' '); - return sb.toString(); - } - } -} diff --git a/org.argeo.core/src/org/argeo/cli/fs/FileSync.java b/org.argeo.core/src/org/argeo/cli/fs/FileSync.java deleted file mode 100644 index ba529eae2..000000000 --- a/org.argeo.core/src/org/argeo/cli/fs/FileSync.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.argeo.cli.fs; - -import java.net.URI; -import java.net.URISyntaxException; -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.cli.CommandArgsException; -import org.argeo.cli.DescribedCommand; -import org.argeo.sync.SyncResult; - -public class FileSync implements DescribedCommand> { - final static Option deleteOption = Option.builder().longOpt("delete").desc("delete from target").build(); - final static Option recursiveOption = Option.builder("r").longOpt("recursive").desc("recurse into directories") - .build(); - final static Option progressOption = Option.builder().longOpt("progress").hasArg(false).desc("show progress") - .build(); - - @Override - public SyncResult apply(List t) { - try { - CommandLine line = toCommandLine(t); - List remaining = line.getArgList(); - if (remaining.size() == 0) { - throw new CommandArgsException("There must be at least one argument"); - } - URI sourceUri = new URI(remaining.get(0)); - URI targetUri; - if (remaining.size() == 1) { - targetUri = Paths.get(System.getProperty("user.dir")).toUri(); - } else { - targetUri = new URI(remaining.get(1)); - } - boolean delete = line.hasOption(deleteOption.getLongOpt()); - boolean recursive = line.hasOption(recursiveOption.getLongOpt()); - PathSync pathSync = new PathSync(sourceUri, targetUri, delete, recursive); - return pathSync.call(); - } catch (URISyntaxException e) { - throw new CommandArgsException(e); - } - } - - @Override - public Options getOptions() { - Options options = new Options(); - options.addOption(recursiveOption); - options.addOption(deleteOption); - options.addOption(progressOption); - return options; - } - - @Override - public String getUsage() { - return "[source URI] [target URI]"; - } - - public static void main(String[] args) { - DescribedCommand.mainImpl(new FileSync(), args); -// Options options = new Options(); -// options.addOption("r", "recursive", false, "recurse into directories"); -// options.addOption(Option.builder().longOpt("progress").hasArg(false).desc("show progress").build()); -// -// CommandLineParser parser = new DefaultParser(); -// try { -// CommandLine line = parser.parse(options, args); -// List remaining = line.getArgList(); -// if (remaining.size() == 0) { -// System.err.println("There must be at least one argument"); -// printHelp(options); -// System.exit(1); -// } -// URI sourceUri = new URI(remaining.get(0)); -// URI targetUri; -// if (remaining.size() == 1) { -// targetUri = Paths.get(System.getProperty("user.dir")).toUri(); -// } else { -// targetUri = new URI(remaining.get(1)); -// } -// PathSync pathSync = new PathSync(sourceUri, targetUri); -// pathSync.run(); -// } catch (Exception exp) { -// exp.printStackTrace(); -// printHelp(options); -// System.exit(1); -// } - } - -// public static void printHelp(Options options) { -// HelpFormatter formatter = new HelpFormatter(); -// formatter.printHelp("sync SRC [DEST]", options, true); -// } - - @Override - public String getDescription() { - return "Synchronises files"; - } - -} diff --git a/org.argeo.core/src/org/argeo/cli/fs/FsCommands.java b/org.argeo.core/src/org/argeo/cli/fs/FsCommands.java deleted file mode 100644 index c08ad0091..000000000 --- a/org.argeo.core/src/org/argeo/cli/fs/FsCommands.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.argeo.cli.fs; - -import org.argeo.cli.CommandsCli; - -/** File utilities. */ -public class FsCommands extends CommandsCli { - - public FsCommands(String commandName) { - super(commandName); - addCommand("sync", new FileSync()); - } - - @Override - public String getDescription() { - return "Utilities around files and file systems"; - } - -} diff --git a/org.argeo.core/src/org/argeo/cli/fs/PathSync.java b/org.argeo.core/src/org/argeo/cli/fs/PathSync.java deleted file mode 100644 index 9ab9cafad..000000000 --- a/org.argeo.core/src/org/argeo/cli/fs/PathSync.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.argeo.cli.fs; - -import java.net.URI; -import java.nio.file.FileSystems; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.spi.FileSystemProvider; -import java.util.concurrent.Callable; - -import org.argeo.sync.SyncResult; - -/** Synchronises two paths. */ -public class PathSync implements Callable> { - private final URI sourceUri, targetUri; - private final boolean delete; - private final boolean recursive; - - public PathSync(URI sourceUri, URI targetUri) { - this(sourceUri, targetUri, false, false); - } - - public PathSync(URI sourceUri, URI targetUri, boolean delete, boolean recursive) { - this.sourceUri = sourceUri; - this.targetUri = targetUri; - this.delete = delete; - this.recursive = recursive; - } - - @Override - public SyncResult call() { - try { - Path sourceBasePath = createPath(sourceUri); - Path targetBasePath = createPath(targetUri); - SyncFileVisitor syncFileVisitor = new SyncFileVisitor(sourceBasePath, targetBasePath, delete, recursive); - Files.walkFileTree(sourceBasePath, syncFileVisitor); - return syncFileVisitor.getSyncResult(); - } catch (Exception e) { - throw new IllegalStateException("Cannot sync " + sourceUri + " to " + targetUri, e); - } - } - - private Path createPath(URI uri) { - Path path; - if (uri.getScheme() == null) { - path = Paths.get(uri.getPath()); - } else if (uri.getScheme().equals("file")) { - FileSystemProvider fsProvider = FileSystems.getDefault().provider(); - path = fsProvider.getPath(uri); - } else if (uri.getScheme().equals("davex")) { - throw new UnsupportedOperationException(); -// FileSystemProvider fsProvider = new DavexFsProvider(); -// path = fsProvider.getPath(uri); -// } else if (uri.getScheme().equals("sftp")) { -// Sftp sftp = new Sftp(uri); -// path = sftp.getBasePath(); - } else - throw new IllegalArgumentException("URI scheme not supported for " + uri); - return path; - } -} diff --git a/org.argeo.core/src/org/argeo/cli/fs/SyncFileVisitor.java b/org.argeo.core/src/org/argeo/cli/fs/SyncFileVisitor.java deleted file mode 100644 index 892df5060..000000000 --- a/org.argeo.core/src/org/argeo/cli/fs/SyncFileVisitor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.argeo.cli.fs; - -import java.nio.file.Path; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.fs.BasicSyncFileVisitor; - -/** Synchronises two directory structures. */ -public class SyncFileVisitor extends BasicSyncFileVisitor { - private final static Log log = LogFactory.getLog(SyncFileVisitor.class); - - public SyncFileVisitor(Path sourceBasePath, Path targetBasePath, boolean delete, boolean recursive) { - super(sourceBasePath, targetBasePath, delete, recursive); - } - - @Override - protected void error(Object obj, Throwable e) { - log.error(obj, e); - } - - @Override - protected boolean isTraceEnabled() { - return log.isTraceEnabled(); - } - - @Override - protected void trace(Object obj) { - log.trace(obj); - } -} diff --git a/org.argeo.core/src/org/argeo/cli/fs/package-info.java b/org.argeo.core/src/org/argeo/cli/fs/package-info.java deleted file mode 100644 index 8ad42b25d..000000000 --- a/org.argeo.core/src/org/argeo/cli/fs/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** File system CLI commands. */ -package org.argeo.cli.fs; \ No newline at end of file diff --git a/org.argeo.core/src/org/argeo/cli/package-info.java b/org.argeo.core/src/org/argeo/cli/package-info.java deleted file mode 100644 index 23895935f..000000000 --- a/org.argeo.core/src/org/argeo/cli/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Command line API. */ -package org.argeo.cli; \ No newline at end of file diff --git a/org.argeo.core/src/org/argeo/cli/posix/Echo.java b/org.argeo.core/src/org/argeo/cli/posix/Echo.java deleted file mode 100644 index 5746ebd0f..000000000 --- a/org.argeo.core/src/org/argeo/cli/posix/Echo.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.argeo.cli.posix; - -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.cli.DescribedCommand; - -public class Echo implements DescribedCommand { - - @Override - public Options getOptions() { - Options options = new Options(); - options.addOption(Option.builder("n").desc("do not output the trailing newline").build()); - return options; - } - - @Override - public String getDescription() { - return "Display a line of text"; - } - - @Override - public String getUsage() { - return "[STRING]..."; - } - - @Override - public String apply(List args) { - CommandLine cl = toCommandLine(args); - - StringBuffer sb = new StringBuffer(); - for (String s : cl.getArgList()) { - sb.append(s).append(' '); - } - - if (cl.hasOption('n')) { - sb.deleteCharAt(sb.length() - 1); - } else { - sb.setCharAt(sb.length() - 1, '\n'); - } - return sb.toString(); - } - -} diff --git a/org.argeo.core/src/org/argeo/cli/posix/PosixCommands.java b/org.argeo.core/src/org/argeo/cli/posix/PosixCommands.java deleted file mode 100644 index bb6af67b8..000000000 --- a/org.argeo.core/src/org/argeo/cli/posix/PosixCommands.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.argeo.cli.posix; - -import org.argeo.cli.CommandsCli; - -/** POSIX commands. */ -public class PosixCommands extends CommandsCli { - - public PosixCommands(String commandName) { - super(commandName); - addCommand("echo", new Echo()); - } - - @Override - public String getDescription() { - return "Reimplementation of some POSIX commands in plain Java"; - } - - public static void main(String[] args) { - mainImpl(new PosixCommands("argeo-posix"), args); - } -} diff --git a/org.argeo.core/src/org/argeo/cli/posix/package-info.java b/org.argeo.core/src/org/argeo/cli/posix/package-info.java deleted file mode 100644 index b0d1a46f9..000000000 --- a/org.argeo.core/src/org/argeo/cli/posix/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Posix CLI commands. */ -package org.argeo.cli.posix; \ No newline at end of file diff --git a/org.argeo.core/src/org/argeo/fs/BasicSyncFileVisitor.java b/org.argeo.core/src/org/argeo/fs/BasicSyncFileVisitor.java deleted file mode 100644 index 03bac592c..000000000 --- a/org.argeo.core/src/org/argeo/fs/BasicSyncFileVisitor.java +++ /dev/null @@ -1,164 +0,0 @@ -package org.argeo.fs; - -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.BasicFileAttributes; -import java.nio.file.attribute.FileTime; - -import org.argeo.sync.SyncResult; - -/** Synchronises two directory structures. */ -public class BasicSyncFileVisitor extends SimpleFileVisitor { - // TODO make it configurable - private boolean trace = false; - - private final Path sourceBasePath; - private final Path targetBasePath; - private final boolean delete; - private final boolean recursive; - - private SyncResult syncResult = new SyncResult<>(); - - public BasicSyncFileVisitor(Path sourceBasePath, Path targetBasePath, boolean delete, boolean recursive) { - this.sourceBasePath = sourceBasePath; - this.targetBasePath = targetBasePath; - this.delete = delete; - this.recursive = recursive; - } - - @Override - public FileVisitResult preVisitDirectory(Path sourceDir, BasicFileAttributes attrs) throws IOException { - if (!recursive && !sourceDir.equals(sourceBasePath)) - return FileVisitResult.SKIP_SUBTREE; - Path targetDir = toTargetPath(sourceDir); - Files.createDirectories(targetDir); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path sourceDir, IOException exc) throws IOException { - if (delete) { - Path targetDir = toTargetPath(sourceDir); - for (Path targetPath : Files.newDirectoryStream(targetDir)) { - Path sourcePath = sourceDir.resolve(targetPath.getFileName()); - if (!Files.exists(sourcePath)) { - try { - FsUtils.delete(targetPath); - deleted(targetPath); - } catch (Exception e) { - deleteFailed(targetPath, exc); - } - } - } - } - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFile(Path sourceFile, BasicFileAttributes attrs) throws IOException { - Path targetFile = toTargetPath(sourceFile); - try { - if (!Files.exists(targetFile)) { - Files.copy(sourceFile, targetFile); - added(sourceFile, targetFile); - } else { - if (shouldOverwrite(sourceFile, targetFile)) { - Files.copy(sourceFile, targetFile, StandardCopyOption.REPLACE_EXISTING); - } - } - } catch (Exception e) { - copyFailed(sourceFile, targetFile, e); - } - return FileVisitResult.CONTINUE; - } - - protected boolean shouldOverwrite(Path sourceFile, Path targetFile) throws IOException { - long sourceSize = Files.size(sourceFile); - long targetSize = Files.size(targetFile); - if (sourceSize != targetSize) { - return true; - } - FileTime sourceLastModif = Files.getLastModifiedTime(sourceFile); - FileTime targetLastModif = Files.getLastModifiedTime(targetFile); - if (sourceLastModif.compareTo(targetLastModif) > 0) - return true; - return shouldOverwriteLaterSameSize(sourceFile, targetFile); - } - - protected boolean shouldOverwriteLaterSameSize(Path sourceFile, Path targetFile) { - return false; - } - -// @Override -// public FileVisitResult visitFileFailed(Path sourceFile, IOException exc) throws IOException { -// error("Cannot sync " + sourceFile, exc); -// return FileVisitResult.CONTINUE; -// } - - private Path toTargetPath(Path sourcePath) { - Path relativePath = sourceBasePath.relativize(sourcePath); - Path targetPath = targetBasePath.resolve(relativePath.toString()); - return targetPath; - } - - public Path getSourceBasePath() { - return sourceBasePath; - } - - public Path getTargetBasePath() { - return targetBasePath; - } - - protected void added(Path sourcePath, Path targetPath) { - syncResult.getAdded().add(targetPath); - if (isTraceEnabled()) - trace("Added " + sourcePath + " as " + targetPath); - } - - protected void modified(Path sourcePath, Path targetPath) { - syncResult.getModified().add(targetPath); - if (isTraceEnabled()) - trace("Overwritten from " + sourcePath + " to " + targetPath); - } - - protected void copyFailed(Path sourcePath, Path targetPath, Exception e) { - syncResult.addError(sourcePath, targetPath, e); - if (isTraceEnabled()) - error("Cannot copy " + sourcePath + " to " + targetPath, e); - } - - protected void deleted(Path targetPath) { - syncResult.getDeleted().add(targetPath); - if (isTraceEnabled()) - trace("Deleted " + targetPath); - } - - protected void deleteFailed(Path targetPath, Exception e) { - syncResult.addError(null, targetPath, e); - if (isTraceEnabled()) - error("Cannot delete " + targetPath, e); - } - - /** Log error. */ - protected void error(Object obj, Throwable e) { - System.err.println(obj); - e.printStackTrace(); - } - - protected boolean isTraceEnabled() { - return trace; - } - - protected void trace(Object obj) { - System.out.println(obj); - } - - public SyncResult getSyncResult() { - return syncResult; - } - -} diff --git a/org.argeo.core/src/org/argeo/fs/FsUtils.java b/org.argeo.core/src/org/argeo/fs/FsUtils.java deleted file mode 100644 index c96f56ed2..000000000 --- a/org.argeo.core/src/org/argeo/fs/FsUtils.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.argeo.fs; - -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; - -/** Utilities around the standard Java file abstractions. */ -public class FsUtils { - /** Sync a source path with a target path. */ - public static void sync(Path sourceBasePath, Path targetBasePath) { - sync(sourceBasePath, targetBasePath, false); - } - - /** Sync a source path with a target path. */ - public static void sync(Path sourceBasePath, Path targetBasePath, boolean delete) { - sync(new BasicSyncFileVisitor(sourceBasePath, targetBasePath, delete, true)); - } - - public static void sync(BasicSyncFileVisitor syncFileVisitor) { - try { - Files.walkFileTree(syncFileVisitor.getSourceBasePath(), syncFileVisitor); - } catch (Exception e) { - throw new RuntimeException("Cannot sync " + syncFileVisitor.getSourceBasePath() + " with " - + syncFileVisitor.getTargetBasePath(), e); - } - } - - /** Deletes this path, recursively if needed. */ - public static void delete(Path path) { - try { - Files.walkFileTree(path, new SimpleFileVisitor() { - @Override - public FileVisitResult postVisitDirectory(Path directory, IOException e) throws IOException { - if (e != null) - throw e; - Files.delete(directory); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Files.delete(file); - return FileVisitResult.CONTINUE; - } - }); - } catch (IOException e) { - throw new RuntimeException("Cannot delete " + path, e); - } - } - - /** Singleton. */ - private FsUtils() { - } - -} diff --git a/org.argeo.core/src/org/argeo/fs/package-info.java b/org.argeo.core/src/org/argeo/fs/package-info.java deleted file mode 100644 index ea2de9ed6..000000000 --- a/org.argeo.core/src/org/argeo/fs/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Generic file system utilities. */ -package org.argeo.fs; \ No newline at end of file diff --git a/org.argeo.core/src/org/argeo/sync/SyncException.java b/org.argeo.core/src/org/argeo/sync/SyncException.java deleted file mode 100644 index 89bf869a2..000000000 --- a/org.argeo.core/src/org/argeo/sync/SyncException.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.argeo.sync; - -/** Commons exception for sync */ -public class SyncException extends RuntimeException { - private static final long serialVersionUID = -3371314343580218538L; - - public SyncException(String message) { - super(message); - } - - public SyncException(String message, Throwable cause) { - super(message, cause); - } - - public SyncException(Object source, Object target, Throwable cause) { - super("Cannot sync from " + source + " to " + target, cause); - } -} diff --git a/org.argeo.core/src/org/argeo/sync/SyncResult.java b/org.argeo.core/src/org/argeo/sync/SyncResult.java deleted file mode 100644 index 6d12ada4a..000000000 --- a/org.argeo.core/src/org/argeo/sync/SyncResult.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.argeo.sync; - -import java.time.Instant; -import java.util.Set; -import java.util.TreeSet; - -/** Describes what happendend during a sync operation. */ -public class SyncResult { - private final Set added = new TreeSet<>(); - private final Set modified = new TreeSet<>(); - private final Set deleted = new TreeSet<>(); - private final Set errors = new TreeSet<>(); - - public Set getAdded() { - return added; - } - - public Set getModified() { - return modified; - } - - public Set getDeleted() { - return deleted; - } - - public Set getErrors() { - return errors; - } - - public void addError(T sourcePath, T targetPath, Exception e) { - Error error = new Error(sourcePath, targetPath, e); - errors.add(error); - } - - public boolean noModification() { - return modified.isEmpty() && deleted.isEmpty() && added.isEmpty(); - } - - @Override - public String toString() { - if (noModification()) - return "No modification."; - StringBuffer sb = new StringBuffer(); - for (T p : modified) - sb.append("MOD ").append(p).append('\n'); - for (T p : deleted) - sb.append("DEL ").append(p).append('\n'); - for (T p : added) - sb.append("ADD ").append(p).append('\n'); - for (Error error : errors) - sb.append(error).append('\n'); - return sb.toString(); - } - - public class Error implements Comparable { - private final T sourcePath;// if null this is a failed delete - private final T targetPath; - private final Exception exception; - private final Instant timestamp = Instant.now(); - - public Error(T sourcePath, T targetPath, Exception e) { - super(); - this.sourcePath = sourcePath; - this.targetPath = targetPath; - this.exception = e; - } - - public T getSourcePath() { - return sourcePath; - } - - public T getTargetPath() { - return targetPath; - } - - public Exception getException() { - return exception; - } - - public Instant getTimestamp() { - return timestamp; - } - - @Override - public int compareTo(Error o) { - return timestamp.compareTo(o.timestamp); - } - - @Override - public int hashCode() { - return timestamp.hashCode(); - } - - @Override - public String toString() { - return "ERR " + timestamp + (sourcePath == null ? "Deletion failed" : "Copy failed " + sourcePath) + " " - + targetPath + " " + exception.getMessage(); - } - - } -} diff --git a/org.argeo.core/src/org/argeo/sync/package-info.java b/org.argeo.core/src/org/argeo/sync/package-info.java deleted file mode 100644 index c5e9da0f6..000000000 --- a/org.argeo.core/src/org/argeo/sync/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Synchrnoisation related utilities. */ -package org.argeo.sync; \ No newline at end of file diff --git a/org.argeo.eclipse.ui.rap/META-INF/.gitignore b/org.argeo.eclipse.ui.rap/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/org.argeo.eclipse.ui.rap/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/org.argeo.eclipse.ui.rap/bnd.bnd b/org.argeo.eclipse.ui.rap/bnd.bnd deleted file mode 100644 index f73a8d019..000000000 --- a/org.argeo.eclipse.ui.rap/bnd.bnd +++ /dev/null @@ -1,11 +0,0 @@ -Import-Package: org.eclipse.swt,\ -org.eclipse.jface.dialogs,\ -org.argeo.eclipse.ui.util,\ -org.eclipse.swt.events,\ -org.eclipse.jetty.util.component;resolution:=optional,\ -org.eclipse.jetty.http;resolution:=optional,\ -org.eclipse.jetty.io;resolution:=optional,\ -org.eclipse.jetty.security;resolution:=optional,\ -org.eclipse.jetty.server.handler;resolution:=optional,\ -org.eclipse.jetty.*;resolution:=optional,\ -* diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java deleted file mode 100644 index b2d3518a7..000000000 --- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.argeo.eclipse.ui.specific; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.eclipse.ui.util.SingleSourcingConstants; -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.rap.rwt.RWT; -import org.eclipse.rap.rwt.client.service.UrlLauncher; - -/** - * RWT specific object to open a file retrieved from the server. It forwards the - * request to the correct service after encoding file name and path in the - * request URI. - * - *

- * The parameter "URI" is used to determine the correct file service, the path - * and the file name. An optional file name can be added to present the end user - * with a different file name as the one used to retrieve it. - *

- * - * - *

- * The instance specific service is called by its ID and must have been - * externally created - *

- */ -public class OpenFile extends AbstractHandler { - private final static Log log = LogFactory.getLog(OpenFile.class); - - public final static String ID = SingleSourcingConstants.OPEN_FILE_CMD_ID; - public final static String PARAM_FILE_NAME = SingleSourcingConstants.PARAM_FILE_NAME; - public final static String PARAM_FILE_URI = SingleSourcingConstants.PARAM_FILE_URI;; - - /* DEPENDENCY INJECTION */ - private String openFileServiceId; - - public Object execute(ExecutionEvent event) { - String fileName = event.getParameter(PARAM_FILE_NAME); - String fileUri = event.getParameter(PARAM_FILE_URI); - // Sanity check - if (fileUri == null || "".equals(fileUri.trim()) || openFileServiceId == null - || "".equals(openFileServiceId.trim())) - return null; - - org.argeo.eclipse.ui.specific.OpenFile openFileClient = new org.argeo.eclipse.ui.specific.OpenFile(); - openFileClient.execute(openFileServiceId, fileUri, fileName); - return null; - } - - public Object execute(String openFileServiceId, String fileUri, String fileName) { - StringBuilder url = new StringBuilder(); - url.append(RWT.getServiceManager().getServiceHandlerUrl(openFileServiceId)); - - if (EclipseUiUtils.notEmpty(fileName)) - url.append("&").append(SingleSourcingConstants.PARAM_FILE_NAME).append("=").append(fileName); - url.append("&").append(SingleSourcingConstants.PARAM_FILE_URI).append("=").append(fileUri); - - String downloadUrl = url.toString(); - if (log.isTraceEnabled()) - log.trace("Calling OpenFileService with ID: " + openFileServiceId + " , with download URL: " + downloadUrl); - - UrlLauncher launcher = RWT.getClient().getService(UrlLauncher.class); - launcher.openURL(downloadUrl); - return null; - } - - /* DEPENDENCY INJECTION */ - public void setOpenFileServiceId(String openFileServiceId) { - this.openFileServiceId = openFileServiceId; - } -} diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java deleted file mode 100644 index 4630d63e6..000000000 --- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.argeo.eclipse.ui.specific; - -import static org.argeo.eclipse.ui.util.SingleSourcingConstants.FILE_SCHEME; -import static org.argeo.eclipse.ui.util.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.eclipse.ui.util.SingleSourcingConstants; -import org.eclipse.rap.rwt.service.ServiceHandler; - -/** - * RWT specific Basic Default service handler that retrieves a file on the - * server file system using its absolute path and forwards it to the end user - * browser. - * - * Clients might extend to provide context specific services - */ -public class OpenFileService implements ServiceHandler { - public OpenFileService() { - } - - public void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - String fileName = request.getParameter(SingleSourcingConstants.PARAM_FILE_NAME); - String uri = request.getParameter(SingleSourcingConstants.PARAM_FILE_URI); - - // Use buffered array to directly write the stream? - if (!uri.startsWith(SingleSourcingConstants.FILE_SCHEME)) - throw new IllegalArgumentException( - "Open file service can only handle files that are on the server file system"); - - // Set the Metadata - response.setContentLength((int) getFileSize(uri)); - if (EclipseUiUtils.isEmpty(fileName)) - fileName = getFileName(uri); - response.setContentType(getMimeType(uri, fileName)); - String contentDisposition = "attachment; filename=\"" + fileName + "\""; - response.setHeader("Content-Disposition", contentDisposition); - - // Useless for current use - // response.setHeader("Content-Transfer-Encoding", "binary"); - // response.setHeader("Pragma", "no-cache"); - // response.setHeader("Cache-Control", "no-cache, must-revalidate"); - - Path path = Paths.get(getAbsPathFromUri(uri)); - Files.copy(path, response.getOutputStream()); - - // FIXME we always use temporary files for the time being. - // the deleteOnClose file only works when the JVM is closed so we - // explicitly delete to avoid overloading the server - if (path.startsWith("/tmp")) - path.toFile().delete(); - } - - protected long getFileSize(String uri) throws IOException { - if (uri.startsWith(SingleSourcingConstants.FILE_SCHEME)) { - Path path = Paths.get(getAbsPathFromUri(uri)); - return Files.size(path); - } - return -1l; - } - - protected String getFileName(String uri) { - if (uri.startsWith(SingleSourcingConstants.FILE_SCHEME)) { - Path path = Paths.get(getAbsPathFromUri(uri)); - return path.getFileName().toString(); - } - return null; - } - - private String getAbsPathFromUri(String uri) { - if (uri.startsWith(FILE_SCHEME)) - return uri.substring((FILE_SCHEME + SCHEME_HOST_SEPARATOR).length()); - // else if (uri.startsWith(JCR_SCHEME)) - // return uri.substring((JCR_SCHEME + SCHEME_HOST_SEPARATOR).length()); - else - throw new IllegalArgumentException("Unknown URI prefix for" + uri); - } - - protected String getMimeType(String uri, String fileName) throws IOException { - if (uri.startsWith(FILE_SCHEME)) { - Path path = Paths.get(getAbsPathFromUri(uri)); - String mimeType = Files.probeContentType(path); - if (EclipseUiUtils.notEmpty(mimeType)) - return mimeType; - } - return "application/octet-stream"; - } -} diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/SingleSourcingException.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/SingleSourcingException.java deleted file mode 100644 index 9b7569066..000000000 --- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/SingleSourcingException.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.argeo.eclipse.ui.specific; - -/** Exception related to SWT/RWT single sourcing. */ -public class SingleSourcingException extends RuntimeException { - private static final long serialVersionUID = -727700418055348468L; - - public SingleSourcingException(String message, Throwable cause) { - super(message, cause); - } - - public SingleSourcingException(String message) { - super(message); - } - -} diff --git a/org.argeo.eclipse.ui/.project b/org.argeo.eclipse.ui/.project deleted file mode 100644 index 3140a5c35..000000000 --- a/org.argeo.eclipse.ui/.project +++ /dev/null @@ -1,24 +0,0 @@ - - - org.argeo.eclipse.ui - - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.pde.ManifestBuilder - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/org.argeo.eclipse.ui/META-INF/.gitignore b/org.argeo.eclipse.ui/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/org.argeo.eclipse.ui/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java deleted file mode 100644 index b99f37a72..000000000 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.argeo.eclipse.ui.util; - -/** - * Centralise constants that are used in both RAP and RCP specific code to avoid - * duplicated declaration - */ -public interface SingleSourcingConstants { - - // Single sourced open file command - String OPEN_FILE_CMD_ID = "org.argeo.cms.ui.workbench.openFile"; - String PARAM_FILE_NAME = "param.fileName"; - String PARAM_FILE_URI = "param.fileURI"; - - String SCHEME_HOST_SEPARATOR = "://"; - String FILE_SCHEME = "file"; - String JCR_SCHEME = "jcr"; -} diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml index 7a3677206..92cdebb08 100644 --- a/org.argeo.enterprise/pom.xml +++ b/org.argeo.enterprise/pom.xml @@ -8,5 +8,5 @@ .. org.argeo.enterprise - Commons Enterprise + Argeo Enterprise \ No newline at end of file diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml index 33a858d3a..554471bcc 100644 --- a/org.argeo.osgi.boot/pom.xml +++ b/org.argeo.osgi.boot/pom.xml @@ -9,7 +9,7 @@ org.argeo.osgi.boot jar - Commons OSGi Boot + OSGi Boot diff --git a/org.argeo.eclipse.ui/.classpath b/org.argeo.swt.specific.rap/.classpath similarity index 100% rename from org.argeo.eclipse.ui/.classpath rename to org.argeo.swt.specific.rap/.classpath diff --git a/org.argeo.eclipse.ui.rap/.project b/org.argeo.swt.specific.rap/.project similarity index 93% rename from org.argeo.eclipse.ui.rap/.project rename to org.argeo.swt.specific.rap/.project index df496c27d..53d797685 100644 --- a/org.argeo.eclipse.ui.rap/.project +++ b/org.argeo.swt.specific.rap/.project @@ -1,6 +1,6 @@ - org.argeo.eclipse.ui.rap + org.argeo.swt.specific.rap diff --git a/org.argeo.core/META-INF/.gitignore b/org.argeo.swt.specific.rap/META-INF/.gitignore similarity index 100% rename from org.argeo.core/META-INF/.gitignore rename to org.argeo.swt.specific.rap/META-INF/.gitignore diff --git a/org.argeo.swt.specific.rap/bnd.bnd b/org.argeo.swt.specific.rap/bnd.bnd new file mode 100644 index 000000000..76bb82c80 --- /dev/null +++ b/org.argeo.swt.specific.rap/bnd.bnd @@ -0,0 +1,5 @@ +Import-Package: org.eclipse.swt,\ +org.eclipse.jface.dialogs,\ +javax.servlet.http,\ +org.eclipse.swt.events,\ +* diff --git a/org.argeo.eclipse.ui.rap/build.properties b/org.argeo.swt.specific.rap/build.properties similarity index 100% rename from org.argeo.eclipse.ui.rap/build.properties rename to org.argeo.swt.specific.rap/build.properties diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.swt.specific.rap/pom.xml similarity index 83% rename from org.argeo.eclipse.ui.rap/pom.xml rename to org.argeo.swt.specific.rap/pom.xml index 8b728c16c..cb73fcd32 100644 --- a/org.argeo.eclipse.ui.rap/pom.xml +++ b/org.argeo.swt.specific.rap/pom.xml @@ -7,15 +7,9 @@ argeo-commons .. - org.argeo.eclipse.ui.rap - Commons Eclipse UI RAP + org.argeo.swt.specific.rap + SWT RAP Specific - - org.argeo.commons - org.argeo.eclipse.ui - 2.3-SNAPSHOT - - org.argeo.tp.rap.e4 diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java similarity index 100% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java rename to org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java similarity index 100% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java rename to org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java similarity index 100% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java rename to org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java similarity index 100% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java rename to org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java similarity index 94% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java rename to org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java index dac270026..72e17a22d 100644 --- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java +++ b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java @@ -45,7 +45,7 @@ public class UiContext { public static void setData(String key, Object value) { Display display = getDisplay(); if (display == null) - throw new SingleSourcingException("Not display available in RAP context"); + throw new IllegalStateException("Not display available"); display.setData(key, value); } diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/package-info.java b/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java similarity index 100% rename from org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/package-info.java rename to org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java diff --git a/pom.xml b/pom.xml index 88ab72780..2721905f8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,19 +20,19 @@ + org.argeo.osgi.boot org.argeo.enterprise - org.argeo.osgi.boot - org.argeo.core + - org.argeo.eclipse.ui - org.argeo.eclipse.ui.rap + org.argeo.swt.specific.rap org.argeo.api org.argeo.cms + org.argeo.cms.swt org.argeo.cms.jcr - org.argeo.cms.ui.theme + org.argeo.cms.ui org.argeo.cms.ui.rap -- 2.30.2