From 1df1bf64759d35d3d72b9d96b26b71118fdbe031 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 24 Nov 2014 12:43:18 +0000 Subject: [PATCH] Move to the root the bundles which will be part of v1.4 and v2.2 git-svn-id: https://svn.argeo.org/commons/trunk@7493 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- base/plugins/pom.xml | 4 +- base/runtime/pom.xml | 4 +- demo/argeo_node_web.properties | 1 + .../org.argeo.dep.jackrabbit/pom.xml | 4 +- {base/dep => dep}/org.argeo.dep.log4j/pom.xml | 2 +- .../org.argeo.eclipse.dep.rap/p2.inf | 0 .../org.argeo.eclipse.dep.rap/pom.xml | 4 +- .../org.argeo.eclipse.dep.rcp/p2.inf | 0 .../org.argeo.eclipse.dep.rcp/pom.xml | 2 +- .../p2.inf | 0 .../pom.xml | 18 +- .../org.argeo.security.dep.node.rap/p2.inf | 0 .../org.argeo.security.dep.node.rap/pom.xml | 26 +-- .../src/assembly/dist.xml | 0 .../org.argeo.security.dep.node.rcp/p2.inf | 0 .../org.argeo.security.dep.node.rcp/pom.xml | 8 +- .../src/assembly/linux.x86.xml | 0 .../src/assembly/linux.x86_64.xml | 0 .../src/assembly/win32.x86.xml | 0 .../org.argeo.security.dep.node/p2.inf | 0 .../org.argeo.security.dep.node/pom.xml | 67 +++---- .../org.argeo.server.dep.ads/pom.xml | 6 +- .../pom.xml | 4 +- {base/dep => dep}/pom.xml | 11 +- {base/dist => dist}/osgi-boot/pom.xml | 4 +- .../osgiboot/osgi-service-init-functions.sh | 0 .../rpm/etc/osgiboot/osgi-service-settings.sh | 0 .../src/main/rpm/usr/sbin/osgi-service | 0 {base/dist => dist}/pom.xml | 5 +- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../build.properties | 0 .../icons/binary.png | Bin .../icons/file.gif | Bin .../icons/folder.gif | Bin .../icons/home.gif | Bin .../icons/node.gif | Bin .../icons/remote_connected.gif | Bin .../icons/remote_disconnected.gif | Bin .../icons/repositories.gif | Bin .../icons/repository_connected.gif | Bin .../icons/repository_disconnected.gif | Bin .../icons/sort.gif | Bin .../icons/workspace_connected.png | Bin .../icons/workspace_disconnected.png | Bin .../pom.xml | 14 +- .../ui/jcr/AbstractNodeContentProvider.java | 0 .../eclipse/ui/jcr/AsyncUiEventListener.java | 0 .../ui/jcr/DefaultNodeLabelProvider.java | 0 .../org/argeo/eclipse/ui/jcr/JcrImages.java | 0 .../eclipse/ui/jcr/JcrPreferenceStore.java | 0 .../org/argeo/eclipse/ui/jcr/JcrUiPlugin.java | 0 .../org/argeo/eclipse/ui/jcr/JcrUiUtils.java | 0 .../eclipse/ui/jcr/NodeElementComparer.java | 0 .../argeo/eclipse/ui/jcr/NodesWrapper.java | 0 .../ui/jcr/SimpleNodeContentProvider.java | 0 .../org/argeo/eclipse/ui/jcr/WrappedNode.java | 0 .../ui/jcr/commands/AddFileFolder.java | 0 .../eclipse/ui/jcr/commands/DeleteNodes.java | 0 .../commands/OpenGenericJcrQueryEditor.java | 0 .../eclipse/ui/jcr/commands/Refresh.java | 0 .../jcr/editors/AbstractJcrQueryEditor.java | 0 .../ui/jcr/editors/JcrQueryEditorInput.java | 0 .../ui/jcr/editors/NodeEditorInput.java | 0 .../ui/jcr/lists/ColumnDefinition.java | 0 .../eclipse/ui/jcr/lists/IListProvider.java | 0 .../ui/jcr/lists/NodeViewerComparator.java | 0 .../ui/jcr/lists/RowViewerComparator.java | 0 .../jcr/lists/SimpleJcrNodeLabelProvider.java | 0 .../jcr/lists/SimpleJcrRowLabelProvider.java | 0 .../eclipse/ui/jcr/utils/JcrFileProvider.java | 0 .../ui/jcr/utils/JcrItemsComparator.java | 0 .../ui/jcr/utils/NodeViewerComparer.java | 0 .../jcr/utils/SingleSessionFileProvider.java | 0 .../ui/jcr/views/AbstractJcrBrowser.java | 0 .../argeo/eclipse/ui/jcr/messages.properties | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../build.properties | 0 .../pom.xml | 8 +- .../ui/specific/DownloadServiceHandler.java | 0 .../ui/specific/EclipseUiSpecificUtils.java | 0 .../eclipse/ui/specific/FileHandler.java | 0 .../eclipse/ui/specific/FileProvider.java | 0 .../ui/specific/GenericUploadControl.java | 0 .../ui/specific/ImportToServerWizardPage.java | 0 .../argeo/eclipse/ui/specific/OpenFile.java | 0 .../eclipse/ui/specific/OpenFileService.java | 0 .../argeo/eclipse/ui/specific/ThreadNLS.java | 0 .../ui/specific/UploadFileWizardPage.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../build.properties | 0 .../pom.xml | 10 +- .../argeo/eclipse/ui/specific/DefaultNLS.java | 0 .../ui/specific/EclipseUiSpecificUtils.java | 0 .../eclipse/ui/specific/FileHandler.java | 0 .../eclipse/ui/specific/FileProvider.java | 0 .../ui/specific/GenericUploadControl.java | 0 .../ui/specific/ImportToServerWizardPage.java | 0 .../argeo/eclipse/ui/specific/OpenFile.java | 0 .../argeo/eclipse/ui/specific/ThreadNLS.java | 0 .../ui/specific/UploadFileWizardPage.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../build.properties | 0 .../pom.xml | 8 +- .../spring/ApplicationContextTracker.java | 0 .../eclipse/spring/SpringCommandHandler.java | 0 .../spring/SpringExtensionFactory.java | 0 .../ui/AbstractTreeContentProvider.java | 0 .../org/argeo/eclipse/ui/ArgeoUiPlugin.java | 0 .../eclipse/ui/ColumnViewerComparator.java | 0 .../argeo/eclipse/ui/EclipseArgeoMonitor.java | 0 .../org/argeo/eclipse/ui/EclipseUiUtils.java | 0 .../main/java/org/argeo/eclipse/ui/Error.java | 0 .../org/argeo/eclipse/ui/ErrorFeedback.java | 0 .../eclipse/ui/GenericTableComparator.java | 0 .../java/org/argeo/eclipse/ui/TreeParent.java | 0 .../org/argeo/eclipse/ui/dialogs/Error.java | 0 .../argeo/eclipse/ui/dialogs/SingleValue.java | 0 .../argeo/eclipse/ui/utils/CommandUtils.java | 0 .../argeo/eclipse/ui/utils/ViewerUtils.java | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 4 +- .../.project | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../WEB-INF/applicationContext.xml | 0 .../WEB-INF/osgi.xml | 0 .../WEB-INF/remoting-servlet.xml | 0 .../WEB-INF/security-filters.xml | 0 .../WEB-INF/web.xml | 0 .../WEB-INF/webdav-config.xml | 0 .../WEB-INF/webdav-servlet.xml | 0 .../build.properties | 0 .../jackrabbit-webapp.properties | 0 .../pom.xml | 4 +- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/spring/commands.xml | 0 .../META-INF/spring/editors.xml | 0 .../META-INF/spring/jcr.xml | 0 .../META-INF/spring/osgi.xml | 0 .../META-INF/spring/views.xml | 0 .../build.properties | 0 .../icons/add.gif | Bin .../icons/addFolder.gif | Bin .../icons/addPrivileges.png | Bin .../icons/addRepo.gif | Bin .../icons/addWorkspace.png | Bin .../icons/browser.gif | Bin .../icons/dumpNode.gif | Bin .../icons/getSize.gif | Bin .../icons/import_fs.png | Bin .../icons/nodes.gif | Bin .../icons/query.png | Bin .../icons/refresh.png | Bin .../icons/remove.gif | Bin .../icons/repositories.gif | Bin .../icons/sort.gif | Bin .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 16 +- .../jcr/ui/explorer/JcrExplorerConstants.java | 0 .../ui/explorer/JcrExplorerPerspective.java | 0 .../jcr/ui/explorer/JcrExplorerPlugin.java | 0 .../jcr/ui/explorer/JcrExplorerView.java | 0 .../explorer/browser/NodeContentProvider.java | 0 .../explorer/browser/NodeLabelProvider.java | 0 .../browser/PropertiesContentProvider.java | 0 .../ui/explorer/commands/AddFolderNode.java | 0 .../ui/explorer/commands/AddPrivileges.java | 0 .../commands/AddRemoteRepository.java | 0 .../ui/explorer/commands/CreateWorkspace.java | 0 .../jcr/ui/explorer/commands/DeleteNodes.java | 0 .../jcr/ui/explorer/commands/DumpNode.java | 0 .../jcr/ui/explorer/commands/EditNode.java | 0 .../jcr/ui/explorer/commands/GetNodeSize.java | 0 .../explorer/commands/ImportFileSystem.java | 0 .../commands/OpenGenericNodeEditor.java | 0 .../jcr/ui/explorer/commands/Refresh.java | 0 .../commands/RemoveRemoteRepository.java | 0 .../ui/explorer/commands/SortChildNodes.java | 0 .../ui/explorer/dialogs/ChooseNameDialog.java | 0 .../ui/explorer/editors/ChildNodesPage.java | 0 .../ui/explorer/editors/EmptyNodePage.java | 0 .../editors/GenericJcrQueryEditor.java | 0 .../explorer/editors/GenericNodeEditor.java | 0 .../editors/GenericNodeEditorInput.java | 0 .../ui/explorer/editors/GenericNodePage.java | 0 .../explorer/editors/GenericPropertyPage.java | 0 .../editors/NodeRightsManagementPage.java | 0 .../editors/NodeVersionHistoryPage.java | 0 .../editors/StringNodeEditorInput.java | 0 .../model/MaintainedRepositoryElem.java | 0 .../explorer/model/RemoteRepositoryElem.java | 0 .../ui/explorer/model/RepositoriesElem.java | 0 .../jcr/ui/explorer/model/RepositoryElem.java | 0 .../ui/explorer/model/SingleJcrNodeElem.java | 0 .../jcr/ui/explorer/model/WorkspaceElem.java | 0 .../FullVersioningTreeContentProvider.java | 0 .../providers/PropertyLabelProvider.java | 0 .../SingleNodeAsTreeContentProvider.java | 0 .../providers/VersionLabelProvider.java | 0 .../utils/GenericNodeDoubleClickListener.java | 0 .../jcr/ui/explorer/utils/JcrUiUtils.java | 0 .../explorer/utils/TreeObjectsComparator.java | 0 .../ui/explorer/views/GenericJcrBrowser.java | 0 .../explorer/wizards/ChangeRightsWizard.java | 0 .../ui/explorer/wizards/ChooseRightsPage.java | 0 .../wizards/ImportFileSystemWizard.java | 0 .../argeo/jcr/ui/explorer/messages.properties | 0 .../.project | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/spring/noderepo-osgi.xml | 0 .../META-INF/spring/noderepo.xml | 0 .../build.properties | 0 .../noderepo.properties | 0 .../pom.xml | 4 +- .../repository-h2.xml | 0 .../repository-memory.xml | 0 .../repository-mysql.xml | 0 .../repository-postgresql.xml | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../build.properties | 0 .../pom.xml | 4 +- .../java/org/argeo/osgi/boot/Activator.java | 0 .../java/org/argeo/osgi/boot/AdminThread.java | 0 .../argeo/osgi/boot/DistributionBundle.java | 0 .../java/org/argeo/osgi/boot/Launcher.java | 0 .../java/org/argeo/osgi/boot/OsgiBoot.java | 0 .../argeo/osgi/boot/OsgiBootException.java | 0 .../org/argeo/osgi/boot/OsgiBootUtils.java | 0 .../internal/springutil/AntPathMatcher.java | 0 .../internal/springutil/CollectionUtils.java | 0 .../boot/internal/springutil/ObjectUtils.java | 0 .../boot/internal/springutil/PathMatcher.java | 0 .../boot/internal/springutil/StringUtils.java | 0 .../springutil/SystemPropertyUtils.java | 0 .../src/test/bundles/jars/test.jar | 0 .../META-INF/MANIFEST.MF | 0 .../META-INF/MANIFEST.MF | 0 .../META-INF/MANIFEST.MF | 0 .../META-INF/MANIFEST.MF | 0 .../osgi/boot/OsgiBootNoRuntimeTest.java | 0 .../argeo/osgi/boot/OsgiBootRuntimeTest.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../build.properties | 0 .../icons/active.gif | Bin .../icons/bundles.gif | Bin .../icons/installed.gif | Bin .../icons/osgi_explorer.gif | Bin .../icons/resolved.gif | Bin .../icons/starting.gif | Bin .../plugin.xml | 0 .../pom.xml | 11 +- .../osgi/ui/explorer/OsgiExplorerImages.java | 0 .../ui/explorer/OsgiExplorerPerspective.java | 0 .../osgi/ui/explorer/OsgiExplorerPlugin.java | 0 .../osgi/ui/explorer/views/BundlesView.java | 0 .../osgi/ui/explorer/views/ModulesView.java | 0 .../.project | 0 .../META-INF/spring/security-ldap-jcr.xml | 0 .../META-INF/spring/security-ldap-osgi.xml | 0 .../spring/security-ldap-services.xml | 0 .../META-INF/spring/security-ldap.xml | 0 .../build.properties | 0 .../ldap.properties | 0 .../pom.xml | 4 +- .../.classpath | 0 .../.project | 0 .../META-INF/spring/logger.xml | 0 .../META-INF/spring/osgi.xml | 0 .../build.properties | 0 .../pom.xml | 22 +-- .../security/NodeAuthenticationToken.java | 0 .../argeo/security/OsAuthenticationToken.java | 0 .../org/argeo/security/SecurityUtils.java | 0 .../argeo/security/SystemAuthentication.java | 0 .../security/SystemExecutionService.java | 0 .../org/argeo/security/UserAdminService.java | 0 .../core/AbstractSystemExecution.java | 0 .../core/AsyncSystemTaskExecutor.java | 0 ...catedApplicationContextInitialization.java | 0 .../core/AuthenticationProvidersRegister.java | 0 .../security/core/ConsoleCallbackHandler.java | 0 .../security/core/InternalAuthentication.java | 0 .../core/KeyBasedSystemExecutionService.java | 0 .../core/MatchingAuthenticationProvider.java | 0 .../core/OsAuthenticationProvider.java | 0 .../argeo/security/core/OsgiModuleLabel.java | 0 .../security/core/SimpleRoleRegistration.java | 0 .../security/crypto/AbstractKeyring.java | 0 .../argeo/security/crypto/CryptoKeyring.java | 0 .../security/crypto/KeyringLoginModule.java | 0 .../security/crypto/PBEKeySpecCallback.java | 0 .../crypto/PasswordBasedEncryption.java | 0 .../org/argeo/security/jcr/JcrKeyring.java | 0 .../argeo/security/jcr/JcrSecurityModel.java | 0 .../argeo/security/jcr/JcrUserDetails.java | 0 .../jcr/OsJcrAuthenticationProvider.java | 0 .../security/jcr/OsJcrUserAdminService.java | 0 .../jcr/RemoteJcrAuthenticationProvider.java | 0 .../jcr/RemoteJcrRepositoryWrapper.java | 0 .../jcr/SecureThreadBoundSession.java | 0 .../security/jcr/SimpleJcrSecurityModel.java | 0 .../JcrPersistentTokenRepository.java | 0 .../argeo/security/log4j/SecureLogger.java | 0 .../org/argeo/security/PasswordSandbox.java | 0 .../crypto/PasswordBasedEncryptionTest.java | 0 .../src/test/resources/log4j.properties | 0 .../org/argeo/security/json/gandalf2.json | 0 .../.project | 0 .../META-INF/spring/security-cli-osgi.xml | 0 .../META-INF/spring/security-cli.xml | 0 .../pom.xml | 4 +- .../security.properties | 0 .../.project | 0 .../META-INF/spring/repofactory.xml | 0 .../META-INF/spring/security-jcr-osgi.xml | 0 .../META-INF/spring/security-jcr-services.xml | 0 .../build.properties | 0 .../pom.xml | 4 +- .../security.properties | 0 .../.project | 0 .../META-INF/spring/security-ldap-jcr.xml | 0 .../META-INF/spring/security-ldap-osgi.xml | 0 .../spring/security-ldap-services.xml | 0 .../META-INF/spring/security-ldap.xml | 0 .../build.properties | 0 .../ldap.properties | 0 .../pom.xml | 4 +- .../.project | 0 .../META-INF/spring/security-os-osgi.xml | 0 .../META-INF/spring/security-os.xml | 0 .../build.properties | 0 .../pom.xml | 4 +- .../security.properties | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/spring/loginModules.xml | 0 .../META-INF/spring/osgi.xml | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 17 +- .../security.properties | 0 .../security/equinox/OsSpringLoginModule.java | 0 .../security/equinox/SpringLoginModule.java | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 15 +- .../jackrabbit/ArgeoAccessManager.java | 0 .../security/jackrabbit/ArgeoLoginModule.java | 0 .../jackrabbit/ArgeoSecurityManager.java | 0 .../jackrabbit/ArgeoSystemPrincipal.java | 0 .../jackrabbit/GrantedAuthorityPrincipal.java | 0 .../jackrabbit/JackrabbitSecurityModel.java | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 8 +- .../ldap/ArgeoLdapShaPasswordEncoder.java | 0 .../ldap/ArgeoLdapUserDetailsManager.java | 0 .../security/ldap/ArgeoUserAdminDaoLdap.java | 0 .../ldap/jcr/JcrLdapSynchronizer.java | 0 .../ldap/jcr/JcrUserDetailsContextMapper.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.maven.ide.eclipse.prefs | 0 .../build.properties | 0 .../pom.xml | 8 +- .../security/mvc/ArgeoRememberMeServices.java | 0 .../security/mvc/ArgeoUserInterceptor.java | 0 .../security/mvc/UsersRolesController.java | 0 .../.classpath | 0 .../.project | 0 .../META-INF/spring/commands.xml | 0 .../META-INF/spring/common.xml | 0 .../META-INF/spring/editors.xml | 0 .../META-INF/spring/osgi.xml | 0 .../META-INF/spring/views.xml | 0 .../build.properties | 0 .../icons/add.gif | Bin .../icons/batch.gif | Bin .../icons/clear.gif | Bin .../icons/refresh.png | Bin .../icons/remove.gif | Bin .../icons/role.gif | Bin .../icons/save.gif | Bin .../icons/save_security.png | Bin .../icons/save_security_disabled.png | Bin .../icons/security.gif | Bin .../icons/sync.gif | Bin .../icons/user.gif | Bin .../icons/users.gif | Bin .../plugin.xml | 0 .../pom.xml | 25 +-- .../security-admin.properties | 0 .../ui/admin/SecurityAdminImages.java | 0 .../ui/admin/SecurityAdminPerspective.java | 0 .../ui/admin/SecurityAdminPlugin.java | 0 .../security/ui/admin/UserTableComposite.java | 0 .../security/ui/admin/commands/AddRole.java | 0 .../ui/admin/commands/DeleteRole.java | 0 .../ui/admin/commands/DeleteUser.java | 0 .../security/ui/admin/commands/NewUser.java | 0 .../admin/commands/OpenArgeoUserEditor.java | 0 .../ui/admin/commands/RefreshRoles.java | 0 .../ui/admin/commands/RefreshUsersList.java | 0 .../ui/admin/commands/SaveArgeoUser.java | 0 .../ui/admin/commands/UserBatchUpdate.java | 0 .../ui/admin/editors/ArgeoUserEditor.java | 0 .../admin/editors/ArgeoUserEditorInput.java | 0 .../ui/admin/editors/DefaultUserMainPage.java | 0 .../ui/admin/editors/UserRolesPage.java | 0 .../security/ui/admin/views/RolesView.java | 0 .../security/ui/admin/views/UsersView.java | 0 .../admin/wizards/MainUserInfoWizardPage.java | 0 .../ui/admin/wizards/NewUserWizard.java | 0 .../admin/wizards/UserBatchUpdateWizard.java | 0 .../.classpath | 0 .../.project | 0 .../META-INF/jaas_default.txt | 0 .../META-INF/spring/commands.xml | 0 .../META-INF/spring/osgi.xml | 0 .../branding/afterLogout.html | 0 .../branding/empty.html | 0 .../branding/favicon.ico | Bin .../branding/login.html | 0 .../branding/public.html | 0 .../build.properties | 0 .../icons/closeAll.gif | Bin .../icons/exit.png | Bin .../icons/home.gif | Bin .../icons/main.gif | Bin .../icons/password.gif | Bin .../icons/preferences.png | Bin .../plugin.xml | 0 .../pom.xml | 27 +-- .../security/ui/rap/AnonymousEntryPoint.java | 0 .../security/ui/rap/LogoutEntryPoint.java | 0 .../argeo/security/ui/rap/NullEntryPoint.java | 0 .../security/ui/rap/RapActionBarAdvisor.java | 0 .../security/ui/rap/RapWindowAdvisor.java | 0 .../security/ui/rap/RapWorkbenchAdvisor.java | 0 .../security/ui/rap/SecureEntryPoint.java | 0 .../security/ui/rap/SecureRapActivator.java | 0 .../security/ui/rap/commands/UserMenu.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/jaas_default.txt | 0 .../build.properties | 0 .../icons/alt_about.gif | Bin .../icons/alt_launcher.icns | Bin .../icons/alt_launcher.ico | Bin .../icons/alt_launcher.xpm | 0 .../icons/alt_window_16.gif | Bin .../icons/alt_window_32.gif | Bin .../plugin.xml | 0 .../plugin_customization.ini | 0 .../pom.xml | 18 +- .../ui/rcp/AbstractSecureApplication.java | 0 .../ui/rcp/SecureActionBarAdvisor.java | 0 .../ui/rcp/SecureApplicationActivator.java | 0 .../org/argeo/security/ui/rcp/SecureRcp.java | 0 .../ui/rcp/SecureWorkbenchAdvisor.java | 0 .../ui/rcp/SecureWorkbenchWindowAdvisor.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/spring/commands.xml | 0 .../META-INF/spring/keyring.xml | 0 .../META-INF/spring/osgi.xml | 0 .../META-INF/spring/views.xml | 0 .../build.properties | 0 .../icons/adminLog.gif | Bin .../icons/home.gif | Bin .../icons/log.gif | Bin .../icons/maintenance.gif | Bin .../icons/password.gif | Bin .../icons/user.gif | Bin .../plugin.xml | 0 .../pom.xml | 17 +- .../securityui.properties | 0 .../security/ui/MaintenancePerspective.java | 0 .../org/argeo/security/ui/PrivilegedJob.java | 0 .../security/ui/RolesSourceProvider.java | 0 .../argeo/security/ui/SecurityUiPlugin.java | 0 .../security/ui/UserHomePerspective.java | 0 .../ui/commands/OpenChangePasswordDialog.java | 0 .../ui/commands/OpenHomePerspective.java | 0 .../ui/dialogs/AbstractLoginDialog.java | 0 .../ui/dialogs/ChangePasswordDialog.java | 0 .../ui/dialogs/DefaultLoginDialog.java | 0 .../security/ui/internal/CurrentUser.java | 0 .../argeo/security/ui/views/AdminLogView.java | 0 .../security/ui/views/LogContentProvider.java | 0 .../org/argeo/security/ui/views/LogView.java | 0 .../argeo/security/ui/views/UserProfile.java | 0 .../.project | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/spring/ads.xml | 0 .../META-INF/spring/server.xml | 0 .../ads.properties | 0 .../build.properties | 0 .../init.ldif | 0 .../pom.xml | 4 +- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.maven.ide.eclipse.prefs | 0 .../build.properties | 0 .../pom.xml | 6 +- .../org/argeo/server/ads/AdsContainer.java | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 6 +- .../java/org/argeo/server/BooleanAnswer.java | 0 .../java/org/argeo/server/Deserializer.java | 0 .../org/argeo/server/DeserializingEditor.java | 0 .../org/argeo/server/PrimitiveAnswer.java | 0 .../java/org/argeo/server/Serializer.java | 0 .../java/org/argeo/server/ServerAnswer.java | 0 .../org/argeo/server/ServerSerializer.java | 0 .../server/backup/AbstractAtomicBackup.java | 0 .../org/argeo/server/backup/AtomicBackup.java | 0 .../argeo/server/backup/BackupContext.java | 0 .../backup/BackupFileSystemManager.java | 0 .../org/argeo/server/backup/BackupPurge.java | 0 .../org/argeo/server/backup/BackupUtils.java | 0 .../org/argeo/server/backup/MySqlBackup.java | 0 .../argeo/server/backup/OpenLdapBackup.java | 0 .../org/argeo/server/backup/OsCallBackup.java | 0 .../argeo/server/backup/PostgreSqlBackup.java | 0 .../server/backup/SimpleBackupContext.java | 0 .../server/backup/SimpleBackupPurge.java | 0 .../org/argeo/server/backup/SvnBackup.java | 0 .../org/argeo/server/backup/SystemBackup.java | 0 .../server/dao/AbstractMemoryDaoSupport.java | 0 .../server/dao/AbstractTabularDaoSupport.java | 0 .../org/argeo/server/dao/LightDaoAware.java | 0 .../server/dao/LightDaoPropertyEditor.java | 0 .../org/argeo/server/dao/LightDaoSupport.java | 0 .../mvc/DefaultHandlerExceptionResolver.java | 0 .../argeo/server/mvc/EmptyViewController.java | 0 .../org/argeo/server/mvc/MvcConstants.java | 0 .../org/argeo/server/mvc/SerializingView.java | 0 .../server/mvc/SerializingViewResolver.java | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 19 +- .../jackrabbit/JackrabbitAuthorizations.java | 0 .../argeo/jackrabbit/JackrabbitContainer.java | 0 .../JackrabbitDataModelMigration.java | 0 .../JackrabbitRepositoryFactory.java | 0 .../argeo/jackrabbit/JackrabbitWrapper.java | 0 .../OsgiJackrabbitRepositoryFactory.java | 0 .../AbstractJackrabbitHandlerMapping.java | 0 .../remote/ExtendedDispatcherServlet.java | 0 .../jackrabbit/remote/IOHandlerWrapper.java | 0 .../jackrabbit/remote/IOManagerBean.java | 0 .../remote/JcrRemotingHandlerMapping.java | 0 .../jackrabbit/remote/JcrRemotingServlet.java | 0 .../remote/OpenInViewSessionProvider.java | 0 .../remote/ScopedSessionProvider.java | 0 .../remote/SimpleSessionProvider.java | 0 .../remote/SimpleWebdavHandlerMapping.java | 0 .../remote/SimpleWebdavServlet.java | 0 .../org/argeo/jackrabbit/repository-fs.xml | 0 .../org/argeo/jackrabbit/repository-h2.xml | 0 .../argeo/jackrabbit/repository-memory.xml | 0 .../src/main/wikitext/design.mediawiki | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 6 +- .../mvc/MultipleRepositoryHandlerMapping.java | 0 .../argeo/jcr/mvc/ResourceProxyServlet.java | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../pom.xml | 14 +- .../java/org/argeo/jcr/ArgeoJcrConstants.java | 0 .../java/org/argeo/jcr/ArgeoJcrUtils.java | 0 .../main/java/org/argeo/jcr/ArgeoNames.java | 0 .../main/java/org/argeo/jcr/ArgeoTypes.java | 0 .../org/argeo/jcr/CollectionNodeIterator.java | 0 .../org/argeo/jcr/DefaultJcrListener.java | 0 .../argeo/jcr/DefaultRepositoryFactory.java | 0 .../argeo/jcr/DefaultRepositoryRegister.java | 0 .../main/java/org/argeo/jcr/JcrCallback.java | 0 .../org/argeo/jcr/JcrRepositoryWrapper.java | 0 .../org/argeo/jcr/JcrResourceAdapter.java | 0 .../org/argeo/jcr/JcrUrlStreamHandler.java | 0 .../src/main/java/org/argeo/jcr/JcrUtils.java | 0 .../org/argeo/jcr/MaintainedRepository.java | 0 .../main/java/org/argeo/jcr/NodeMapper.java | 0 .../org/argeo/jcr/NodeMapperProvider.java | 0 .../main/java/org/argeo/jcr/PropertyDiff.java | 0 .../org/argeo/jcr/RepositoryRegister.java | 0 .../jcr/ThreadBoundJcrSessionFactory.java | 0 .../main/java/org/argeo/jcr/UserJcrUtils.java | 0 .../main/java/org/argeo/jcr/VersionDiff.java | 0 .../org/argeo/jcr/proxy/AbstractUrlProxy.java | 0 .../org/argeo/jcr/proxy/ResourceProxy.java | 0 .../argeo/jcr/security/JcrAuthorizations.java | 0 .../org/argeo/jcr/spring/BeanNodeMapper.java | 0 .../argeo/jcr/spring/ThreadBoundSession.java | 0 .../jcr/tabular/JcrTabularRowIterator.java | 0 .../argeo/jcr/tabular/JcrTabularWriter.java | 0 .../argeo/jcr/unit/AbstractJcrTestCase.java | 0 .../main/resources/org/argeo/jcr/argeo.cnd | 0 .../AbstractInternalJackrabbitTestCase.java | 0 .../java/org/argeo/jcr/CollectionsObject.java | 0 .../test/java/org/argeo/jcr/MapperTest.java | 0 .../test/java/org/argeo/jcr/OtherObject.java | 0 .../test/java/org/argeo/jcr/SimpleObject.java | 0 .../org/argeo/jcr/tabular/JcrTabularTest.java | 0 .../server/jcr/JcrResourceAdapterTest.java | 0 .../src/test/resources/log4j.properties | 0 .../org/argeo/server/jcr/dummy00.xls | Bin .../org/argeo/server/jcr/dummy01.xls | Bin .../org/argeo/server/jcr/dummy02.xls | Bin .../org/argeo/server/jcr/dummy03.xls | Bin .../org/argeo/server/jcr/repository-h2.xml | 0 .../argeo/server/jcr/repository-memory.xml | 0 .../.project | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/context-template.xml | 0 .../WEB-INF/applicationContext.xml | 0 .../WEB-INF/osgi.xml | 0 .../WEB-INF/security-filters.xml | 0 .../WEB-INF/service-servlet.xml | 0 .../WEB-INF/web.xml | 0 .../build.properties | 0 .../pom.xml | 4 +- .../rap-webapp.properties | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.maven.ide.eclipse.prefs | 0 .../pom.xml | 4 +- .../support/junit/AbstractSpringTestCase.java | 0 .../.classpath | 0 .../.project | 0 .../build.properties | 0 .../org.argeo.util => org.argeo.util}/pom.xml | 4 +- .../main/java/org/argeo/ArgeoException.java | 0 .../main/java/org/argeo/ArgeoLogListener.java | 0 .../src/main/java/org/argeo/ArgeoLogger.java | 0 .../src/main/java/org/argeo/ArgeoMonitor.java | 0 .../main/java/org/argeo/OperatingSystem.java | 0 .../src/main/java/org/argeo/StreamUtils.java | 0 .../main/java/org/argeo/util/CsvParser.java | 0 .../argeo/util/CsvParserWithLinesAsMap.java | 0 .../main/java/org/argeo/util/CsvWriter.java | 0 .../java/org/argeo/util/LocaleCallback.java | 0 .../main/java/org/argeo/util/LocaleUtils.java | 0 .../main/java/org/argeo/util/Throughput.java | 0 .../java/org/argeo/util/ThroughputEditor.java | 0 .../org/argeo/util/security/DigestUtils.java | 0 .../java/org/argeo/util/security/Keyring.java | 0 .../argeo/util/security/SimplePrincipal.java | 0 .../argeo/util/tabular/ArrayTabularRow.java | 0 .../argeo/util/tabular/CsvTabularWriter.java | 0 .../org/argeo/util/tabular/TabularColumn.java | 0 .../argeo/util/tabular/TabularContent.java | 0 .../org/argeo/util/tabular/TabularRow.java | 0 .../util/tabular/TabularRowIterator.java | 0 .../org/argeo/util/tabular/TabularWriter.java | 0 .../argeo/util/CsvParserEncodingTestCase.java | 0 .../argeo/util/CsvParserParseFileTest.java | 0 .../org/argeo/util/CsvParserTestCase.java | 0 .../CsvParserWithQuotedSeparatorTest.java | 0 .../org/argeo/util/CsvWriterTestCase.java | 0 .../java/org/argeo/util/ThroughputTest.java | 0 .../org/argeo/util/ReferenceFile.csv | 0 .../org/argeo/util/TestParse-ISO.csv | 0 .../org/argeo/util/TestParse-UTF-8.csv | 0 pom.xml | 170 +++++++++++------- security/dep/pom.xml | 2 +- .../modules/org.argeo.security.webapp/pom.xml | 4 +- security/modules/pom.xml | 4 +- security/plugins/pom.xml | 4 +- .../org.argeo.security.activemq/pom.xml | 8 +- security/runtime/pom.xml | 4 +- .../dep/org.argeo.server.dep.activemq/pom.xml | 6 +- .../org.argeo.server.dep.hibernate/pom.xml | 4 +- .../dep/org.argeo.server.dep.tomcat/pom.xml | 10 +- server/dep/pom.xml | 4 +- server/modules/org.argeo.ext.bsf/pom.xml | 4 +- .../org.argeo.ext.jackrabbit.sybase/pom.xml | 4 +- .../org.argeo.server.activemq.broker/pom.xml | 4 +- .../modules/org.argeo.server.catalina/pom.xml | 4 +- server/modules/org.argeo.server.jdbc/pom.xml | 4 +- server/modules/pom.xml | 4 +- server/plugins/pom.xml | 4 +- .../org.argeo.server.catalina.start/pom.xml | 4 +- .../org.argeo.server.hibernate/pom.xml | 8 +- server/runtime/org.argeo.server.json/pom.xml | 6 +- server/runtime/org.argeo.server.jxl/pom.xml | 8 +- .../org.argeo.server.modeshape/pom.xml | 10 +- .../org.argeo.server.webextender/pom.xml | 4 +- server/runtime/pom.xml | 4 +- 722 files changed, 433 insertions(+), 356 deletions(-) rename {base/dep => dep}/org.argeo.dep.jackrabbit/pom.xml (96%) rename {base/dep => dep}/org.argeo.dep.log4j/pom.xml (97%) rename {base/dep => dep}/org.argeo.eclipse.dep.rap/p2.inf (100%) rename {base/dep => dep}/org.argeo.eclipse.dep.rap/pom.xml (98%) rename {base/dep => dep}/org.argeo.eclipse.dep.rcp/p2.inf (100%) rename {base/dep => dep}/org.argeo.eclipse.dep.rcp/pom.xml (99%) rename {security/dep => dep}/org.argeo.security.dep.node.eclipse/p2.inf (100%) rename {security/dep => dep}/org.argeo.security.dep.node.eclipse/pom.xml (89%) rename {security/dep => dep}/org.argeo.security.dep.node.rap/p2.inf (100%) rename {security/dep => dep}/org.argeo.security.dep.node.rap/pom.xml (89%) rename {security/dep => dep}/org.argeo.security.dep.node.rap/src/assembly/dist.xml (100%) rename {security/dep => dep}/org.argeo.security.dep.node.rcp/p2.inf (100%) rename {security/dep => dep}/org.argeo.security.dep.node.rcp/pom.xml (94%) rename {security/dep => dep}/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml (100%) rename {security/dep => dep}/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml (100%) rename {security/dep => dep}/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml (100%) rename {security/dep => dep}/org.argeo.security.dep.node/p2.inf (100%) rename {security/dep => dep}/org.argeo.security.dep.node/pom.xml (87%) rename {server/dep => dep}/org.argeo.server.dep.ads/pom.xml (92%) rename {server/dep => dep}/org.argeo.server.dep.jackrabbit.server/pom.xml (96%) rename {base/dep => dep}/pom.xml (79%) rename {base/dist => dist}/osgi-boot/pom.xml (98%) rename {base/dist => dist}/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-init-functions.sh (100%) rename {base/dist => dist}/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-settings.sh (100%) rename {base/dist => dist}/osgi-boot/src/main/rpm/usr/sbin/osgi-service (100%) rename {base/dist => dist}/pom.xml (80%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/.classpath (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/.project (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/.settings/org.eclipse.pde.core.prefs (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/build.properties (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/binary.png (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/file.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/folder.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/home.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/node.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/remote_connected.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/remote_disconnected.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/repositories.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/repository_connected.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/repository_disconnected.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/sort.gif (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/workspace_connected.png (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/icons/workspace_disconnected.png (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/pom.xml (88%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java (100%) rename {base/runtime/org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui.jcr}/src/main/resources/org/argeo/eclipse/ui/jcr/messages.properties (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/.classpath (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/.project (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/build.properties (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/pom.xml (93%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rap => org.argeo.eclipse.ui.rap}/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/.classpath (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/.project (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/build.properties (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/pom.xml (91%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java (100%) rename {base/runtime/org.argeo.eclipse.ui.rcp => org.argeo.eclipse.ui.rcp}/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/.classpath (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/.project (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/.settings/org.eclipse.pde.core.prefs (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/build.properties (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/pom.xml (93%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/AbstractTreeContentProvider.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/ArgeoUiPlugin.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/ColumnViewerComparator.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/EclipseArgeoMonitor.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/EclipseUiUtils.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/Error.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/GenericTableComparator.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/TreeParent.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/utils/CommandUtils.java (100%) rename {base/runtime/org.argeo.eclipse.ui => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/utils/ViewerUtils.java (100%) rename {server/modules/org.argeo.ext.jdbm => org.argeo.ext.jdbm}/.project (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.ext.jdbm}/build.properties (100%) rename {server/modules/org.argeo.ext.jdbm => org.argeo.ext.jdbm}/pom.xml (92%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/.project (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/.settings/org.eclipse.pde.core.prefs (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/applicationContext.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/osgi.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/remoting-servlet.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/security-filters.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/web.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/webdav-config.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/WEB-INF/webdav-servlet.xml (100%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.jackrabbit.webapp}/build.properties (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/jackrabbit-webapp.properties (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.jackrabbit.webapp}/pom.xml (95%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/.classpath (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/.project (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/.settings/org.eclipse.jdt.core.prefs (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/META-INF/spring/commands.xml (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/META-INF/spring/editors.xml (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/META-INF/spring/jcr.xml (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/META-INF/spring/osgi.xml (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/META-INF/spring/views.xml (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/build.properties (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.jcr.ui.explorer}/icons/add.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/addFolder.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/addPrivileges.png (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/addRepo.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/addWorkspace.png (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/browser.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/dumpNode.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/getSize.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/import_fs.png (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/nodes.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/query.png (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.jcr.ui.explorer}/icons/refresh.png (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.jcr.ui.explorer}/icons/remove.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/repositories.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/icons/sort.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/plugin.properties (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/plugin.xml (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/pom.xml (78%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerConstants.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPerspective.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPlugin.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerView.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/browser/PropertiesContentProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/AddFolderNode.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/AddPrivileges.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/CreateWorkspace.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/DumpNode.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/GetNodeSize.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/Refresh.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/RemoveRemoteRepository.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/commands/SortChildNodes.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/dialogs/ChooseNameDialog.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/ChildNodesPage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/EmptyNodePage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericJcrQueryEditor.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditor.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditorInput.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodePage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericPropertyPage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeRightsManagementPage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeVersionHistoryPage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/editors/StringNodeEditorInput.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/model/MaintainedRepositoryElem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/model/RemoteRepositoryElem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoriesElem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoryElem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/model/SingleJcrNodeElem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceElem.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/providers/FullVersioningTreeContentProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/providers/PropertyLabelProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/providers/SingleNodeAsTreeContentProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/providers/VersionLabelProvider.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/utils/TreeObjectsComparator.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChangeRightsWizard.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChooseRightsPage.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.jcr.ui.explorer}/src/main/resources/org/argeo/jcr/ui/explorer/messages.properties (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/.project (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/.settings/org.eclipse.pde.core.prefs (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/META-INF/spring/noderepo-osgi.xml (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/META-INF/spring/noderepo.xml (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/build.properties (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/noderepo.properties (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/pom.xml (94%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/repository-h2.xml (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/repository-memory.xml (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/repository-mysql.xml (100%) rename {server/modules/org.argeo.node.repo.jackrabbit => org.argeo.node.repo.jackrabbit}/repository-postgresql.xml (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/.classpath (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/.project (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/build.properties (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/pom.xml (94%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/Activator.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/AdminThread.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/DistributionBundle.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/Launcher.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/OsgiBoot.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/OsgiBootException.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/bundles/jars/test.jar (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java (100%) rename {base/runtime/org.argeo.osgi.boot => org.argeo.osgi.boot}/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/.classpath (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/.project (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/build.properties (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/icons/active.gif (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/icons/bundles.gif (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/icons/installed.gif (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/icons/osgi_explorer.gif (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/icons/resolved.gif (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/icons/starting.gif (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/plugin.xml (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/pom.xml (85%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerImages.java (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPerspective.java (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPlugin.java (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java (100%) rename {base/plugins/org.argeo.osgi.ui.explorer => org.argeo.osgi.ui.explorer}/src/main/java/org/argeo/osgi/ui/explorer/views/ModulesView.java (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/.project (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/META-INF/spring/security-ldap-jcr.xml (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/META-INF/spring/security-ldap-osgi.xml (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/META-INF/spring/security-ldap-services.xml (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/META-INF/spring/security-ldap.xml (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.auth.ldap}/build.properties (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/ldap.properties (100%) rename {security/modules/org.argeo.security.auth.ldap => org.argeo.security.auth.ldap}/pom.xml (90%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/.classpath (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/.project (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/META-INF/spring/logger.xml (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/META-INF/spring/osgi.xml (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/build.properties (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/pom.xml (88%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/NodeAuthenticationToken.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/OsAuthenticationToken.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/SecurityUtils.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/SystemAuthentication.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/SystemExecutionService.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/UserAdminService.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/AbstractSystemExecution.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/InternalAuthentication.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/OsgiModuleLabel.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/crypto/AbstractKeyring.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/crypto/CryptoKeyring.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/JcrKeyring.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/JcrUserDetails.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/main/java/org/argeo/security/log4j/SecureLogger.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/test/java/org/argeo/security/PasswordSandbox.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/test/resources/log4j.properties (100%) rename {security/runtime/org.argeo.security.core => org.argeo.security.core}/src/test/resources/org/argeo/security/json/gandalf2.json (100%) rename {security/modules/org.argeo.security.dao.cli => org.argeo.security.dao.cli}/.project (100%) rename {security/modules/org.argeo.security.dao.cli => org.argeo.security.dao.cli}/META-INF/spring/security-cli-osgi.xml (100%) rename {security/modules/org.argeo.security.dao.cli => org.argeo.security.dao.cli}/META-INF/spring/security-cli.xml (100%) rename {security/modules/org.argeo.security.dao.cli => org.argeo.security.dao.cli}/pom.xml (88%) rename {security/modules/org.argeo.security.dao.cli => org.argeo.security.dao.cli}/security.properties (100%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.security.dao.jackrabbit}/.project (100%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.security.dao.jackrabbit}/META-INF/spring/repofactory.xml (100%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.security.dao.jackrabbit}/META-INF/spring/security-jcr-osgi.xml (100%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.security.dao.jackrabbit}/META-INF/spring/security-jcr-services.xml (100%) rename {security/modules/org.argeo.security.dao.os => org.argeo.security.dao.jackrabbit}/build.properties (100%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.security.dao.jackrabbit}/pom.xml (86%) rename {security/modules/org.argeo.security.dao.jackrabbit => org.argeo.security.dao.jackrabbit}/security.properties (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/.project (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/META-INF/spring/security-ldap-jcr.xml (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/META-INF/spring/security-ldap-osgi.xml (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/META-INF/spring/security-ldap-services.xml (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/META-INF/spring/security-ldap.xml (100%) rename {server/modules/org.argeo.ext.jdbm => org.argeo.security.dao.ldap}/build.properties (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/ldap.properties (100%) rename {security/modules/org.argeo.security.dao.ldap => org.argeo.security.dao.ldap}/pom.xml (90%) rename {security/modules/org.argeo.security.dao.os => org.argeo.security.dao.os}/.project (100%) rename {security/modules/org.argeo.security.dao.os => org.argeo.security.dao.os}/META-INF/spring/security-os-osgi.xml (100%) rename {security/modules/org.argeo.security.dao.os => org.argeo.security.dao.os}/META-INF/spring/security-os.xml (100%) rename {server/modules/org.argeo.jackrabbit.webapp => org.argeo.security.dao.os}/build.properties (100%) rename {security/modules/org.argeo.security.dao.os => org.argeo.security.dao.os}/pom.xml (88%) rename {security/modules/org.argeo.security.dao.os => org.argeo.security.dao.os}/security.properties (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/.classpath (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/.project (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/.settings/org.eclipse.pde.core.prefs (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/META-INF/spring/loginModules.xml (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/META-INF/spring/osgi.xml (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/build.properties (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/plugin.xml (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/pom.xml (75%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/security.properties (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/src/main/java/org/argeo/security/equinox/OsSpringLoginModule.java (100%) rename {security/plugins/org.argeo.security.equinox => org.argeo.security.equinox}/src/main/java/org/argeo/security/equinox/SpringLoginModule.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.jackrabbit}/.classpath (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/.project (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/build.properties (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/pom.xml (74%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.jackrabbit}/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ldap}/.classpath (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/.project (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/build.properties (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/pom.xml (91%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ldap}/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/.classpath (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/.project (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/.settings/org.eclipse.jdt.core.prefs (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/.settings/org.maven.ide.eclipse.prefs (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/build.properties (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/pom.xml (91%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java (100%) rename {security/runtime/org.argeo.security.mvc => org.argeo.security.mvc}/src/main/java/org/argeo/security/mvc/UsersRolesController.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/.classpath (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/.project (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/META-INF/spring/commands.xml (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/META-INF/spring/common.xml (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/META-INF/spring/editors.xml (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/META-INF/spring/osgi.xml (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/META-INF/spring/views.xml (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/build.properties (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.security.ui.admin}/icons/add.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/batch.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/clear.gif (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.security.ui.admin}/icons/refresh.png (100%) rename {server/plugins/org.argeo.jcr.ui.explorer => org.argeo.security.ui.admin}/icons/remove.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/role.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/save.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/save_security.png (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/save_security_disabled.png (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/security.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/sync.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/user.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/icons/users.gif (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/plugin.xml (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/pom.xml (81%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/security-admin.properties (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/SecurityAdminImages.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/UserTableComposite.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/DeleteRole.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/DeleteUser.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/RefreshRoles.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/commands/UserBatchUpdate.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/editors/UserRolesPage.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/views/RolesView.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/views/UsersView.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java (100%) rename {security/plugins/org.argeo.security.ui.admin => org.argeo.security.ui.admin}/src/main/java/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java (100%) rename {security/runtime/org.argeo.security.jackrabbit => org.argeo.security.ui.rap}/.classpath (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/.project (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/META-INF/jaas_default.txt (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/META-INF/spring/commands.xml (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/META-INF/spring/osgi.xml (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/branding/afterLogout.html (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/branding/empty.html (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/branding/favicon.ico (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/branding/login.html (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/branding/public.html (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/build.properties (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/icons/closeAll.gif (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/icons/exit.png (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/icons/home.gif (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/icons/main.gif (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/icons/password.gif (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/icons/preferences.png (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/plugin.xml (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/pom.xml (72%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/RapActionBarAdvisor.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/RapWindowAdvisor.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java (100%) rename {security/plugins/org.argeo.security.ui.rap => org.argeo.security.ui.rap}/src/main/java/org/argeo/security/ui/rap/commands/UserMenu.java (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/.classpath (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/.project (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/.settings/org.eclipse.jdt.core.prefs (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/META-INF/jaas_default.txt (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/build.properties (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/icons/alt_about.gif (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/icons/alt_launcher.icns (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/icons/alt_launcher.ico (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/icons/alt_launcher.xpm (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/icons/alt_window_16.gif (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/icons/alt_window_32.gif (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/plugin.xml (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/plugin_customization.ini (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/pom.xml (80%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java (100%) rename {security/plugins/org.argeo.security.ui.rcp => org.argeo.security.ui.rcp}/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java (100%) rename {security/runtime/org.argeo.security.ldap => org.argeo.security.ui}/.classpath (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/.project (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/.settings/org.eclipse.pde.core.prefs (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/META-INF/spring/commands.xml (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/META-INF/spring/keyring.xml (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/META-INF/spring/osgi.xml (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/META-INF/spring/views.xml (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/build.properties (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/icons/adminLog.gif (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/icons/home.gif (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/icons/log.gif (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/icons/maintenance.gif (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/icons/password.gif (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/icons/user.gif (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/plugin.xml (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/pom.xml (79%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/securityui.properties (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/MaintenancePerspective.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/PrivilegedJob.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/RolesSourceProvider.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/UserHomePerspective.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/commands/OpenHomePerspective.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/internal/CurrentUser.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/views/AdminLogView.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/views/LogContentProvider.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/views/LogView.java (100%) rename {security/plugins/org.argeo.security.ui => org.argeo.security.ui}/src/main/java/org/argeo/security/ui/views/UserProfile.java (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/.project (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/.settings/org.eclipse.pde.core.prefs (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/META-INF/spring/ads.xml (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/META-INF/spring/server.xml (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/ads.properties (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/build.properties (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/init.ldif (100%) rename {server/modules/org.argeo.server.ads.server => org.argeo.server.ads.server}/pom.xml (95%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/.classpath (100%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/.project (100%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/.settings/org.eclipse.jdt.core.prefs (100%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/.settings/org.maven.ide.eclipse.prefs (100%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/build.properties (100%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/pom.xml (94%) rename {server/runtime/org.argeo.server.ads => org.argeo.server.ads}/src/main/java/org/argeo/server/ads/AdsContainer.java (100%) rename {base/runtime/org.argeo.support.junit => org.argeo.server.core}/.classpath (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/.project (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/build.properties (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/pom.xml (95%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/BooleanAnswer.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/Deserializer.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/DeserializingEditor.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/PrimitiveAnswer.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/Serializer.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/ServerAnswer.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/ServerSerializer.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/AtomicBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/BackupContext.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/BackupPurge.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/BackupUtils.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/MySqlBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/OpenLdapBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/OsCallBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/SimpleBackupContext.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/SvnBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/backup/SystemBackup.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/dao/LightDaoAware.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/dao/LightDaoSupport.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/mvc/EmptyViewController.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/mvc/MvcConstants.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/mvc/SerializingView.java (100%) rename {server/runtime/org.argeo.server.core => org.argeo.server.core}/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/.classpath (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/.project (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/build.properties (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/pom.xml (80%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/JackrabbitDataModelMigration.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/IOHandlerWrapper.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/IOManagerBean.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/ScopedSessionProvider.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/resources/org/argeo/jackrabbit/repository-fs.xml (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/resources/org/argeo/jackrabbit/repository-h2.xml (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/resources/org/argeo/jackrabbit/repository-memory.xml (100%) rename {server/runtime/org.argeo.server.jackrabbit => org.argeo.server.jackrabbit}/src/main/wikitext/design.mediawiki (100%) rename {server/runtime/org.argeo.server.jcr.mvc => org.argeo.server.jcr.mvc}/.classpath (100%) rename {server/runtime/org.argeo.server.jcr.mvc => org.argeo.server.jcr.mvc}/.project (100%) rename {server/runtime/org.argeo.server.jcr.mvc => org.argeo.server.jcr.mvc}/build.properties (100%) rename {server/runtime/org.argeo.server.jcr.mvc => org.argeo.server.jcr.mvc}/pom.xml (94%) rename {server/runtime/org.argeo.server.jcr.mvc => org.argeo.server.jcr.mvc}/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java (100%) rename {server/runtime/org.argeo.server.jcr.mvc => org.argeo.server.jcr.mvc}/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/.classpath (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/.project (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/build.properties (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/pom.xml (91%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ArgeoNames.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ArgeoTypes.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/CollectionNodeIterator.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/DefaultJcrListener.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/DefaultRepositoryFactory.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/JcrCallback.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/JcrRepositoryWrapper.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/JcrResourceAdapter.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/JcrUrlStreamHandler.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/JcrUtils.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/MaintainedRepository.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/NodeMapper.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/NodeMapperProvider.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/PropertyDiff.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/RepositoryRegister.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/UserJcrUtils.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/VersionDiff.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/spring/BeanNodeMapper.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/spring/ThreadBoundSession.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/main/resources/org/argeo/jcr/argeo.cnd (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/CollectionsObject.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/MapperTest.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/OtherObject.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/SimpleObject.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/log4j.properties (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy00.xls (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy01.xls (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy02.xls (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/dummy03.xls (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/repository-h2.xml (100%) rename {server/runtime/org.argeo.server.jcr => org.argeo.server.jcr}/src/test/resources/org/argeo/server/jcr/repository-memory.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/.project (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/.settings/org.eclipse.pde.core.prefs (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/META-INF/context-template.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/WEB-INF/applicationContext.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/WEB-INF/osgi.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/WEB-INF/security-filters.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/WEB-INF/service-servlet.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/WEB-INF/web.xml (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/build.properties (100%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/pom.xml (95%) rename {server/modules/org.argeo.server.rap.webapp => org.argeo.server.rap.webapp}/rap-webapp.properties (100%) rename {server/runtime/org.argeo.server.core => org.argeo.support.junit}/.classpath (100%) rename {base/runtime/org.argeo.support.junit => org.argeo.support.junit}/.project (100%) rename {base/runtime/org.argeo.support.junit => org.argeo.support.junit}/.settings/org.eclipse.jdt.core.prefs (100%) rename {base/runtime/org.argeo.support.junit => org.argeo.support.junit}/.settings/org.maven.ide.eclipse.prefs (100%) rename {base/runtime/org.argeo.support.junit => org.argeo.support.junit}/pom.xml (95%) rename {base/runtime/org.argeo.support.junit => org.argeo.support.junit}/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/.classpath (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/.project (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/build.properties (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/pom.xml (91%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/ArgeoException.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/ArgeoLogListener.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/ArgeoLogger.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/ArgeoMonitor.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/OperatingSystem.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/StreamUtils.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/CsvParser.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/CsvWriter.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/LocaleCallback.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/LocaleUtils.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/Throughput.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/ThroughputEditor.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/security/DigestUtils.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/security/Keyring.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/security/SimplePrincipal.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/TabularColumn.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/TabularContent.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/TabularRow.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/TabularRowIterator.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/main/java/org/argeo/util/tabular/TabularWriter.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/java/org/argeo/util/CsvParserParseFileTest.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/java/org/argeo/util/CsvParserTestCase.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/java/org/argeo/util/CsvWriterTestCase.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/java/org/argeo/util/ThroughputTest.java (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/resources/org/argeo/util/ReferenceFile.csv (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/resources/org/argeo/util/TestParse-ISO.csv (100%) rename {base/runtime/org.argeo.util => org.argeo.util}/src/test/resources/org/argeo/util/TestParse-UTF-8.csv (100%) diff --git a/base/plugins/pom.xml b/base/plugins/pom.xml index 967c50194..4eb1ec8ad 100644 --- a/base/plugins/pom.xml +++ b/base/plugins/pom.xml @@ -6,8 +6,8 @@ 2.1.12-SNAPSHOT .. - org.argeo.commons.base - plugins + org.argeo.commons + argeo-commons Commons OSGi Eclipse Plugins pom diff --git a/base/runtime/pom.xml b/base/runtime/pom.xml index 8e2efbc20..c3ec59765 100644 --- a/base/runtime/pom.xml +++ b/base/runtime/pom.xml @@ -6,8 +6,8 @@ 2.1.12-SNAPSHOT .. - org.argeo.commons.base - runtime + org.argeo.commons + argeo-commons Commons Base Runtime pom diff --git a/demo/argeo_node_web.properties b/demo/argeo_node_web.properties index 65d63bcf8..ea1b6b127 100644 --- a/demo/argeo_node_web.properties +++ b/demo/argeo_node_web.properties @@ -90,6 +90,7 @@ eclipse.registry.MultiLanguage=true osgi.noShutdown=true eclipse.ignoreApp=true +#osgi.console.enable.builtin=true # Tomcat #argeo.server.port.http=7070 diff --git a/base/dep/org.argeo.dep.jackrabbit/pom.xml b/dep/org.argeo.dep.jackrabbit/pom.xml similarity index 96% rename from base/dep/org.argeo.dep.jackrabbit/pom.xml rename to dep/org.argeo.dep.jackrabbit/pom.xml index d355e93a5..1ebb949c6 100644 --- a/base/dep/org.argeo.dep.jackrabbit/pom.xml +++ b/dep/org.argeo.dep.jackrabbit/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -32,7 +32,7 @@ org.apache.lucene - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom diff --git a/base/dep/org.argeo.dep.log4j/pom.xml b/dep/org.argeo.dep.log4j/pom.xml similarity index 97% rename from base/dep/org.argeo.dep.log4j/pom.xml rename to dep/org.argeo.dep.log4j/pom.xml index 5686f41fc..15bf5d086 100644 --- a/base/dep/org.argeo.dep.log4j/pom.xml +++ b/dep/org.argeo.dep.log4j/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT dep .. diff --git a/base/dep/org.argeo.eclipse.dep.rap/p2.inf b/dep/org.argeo.eclipse.dep.rap/p2.inf similarity index 100% rename from base/dep/org.argeo.eclipse.dep.rap/p2.inf rename to dep/org.argeo.eclipse.dep.rap/p2.inf diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/dep/org.argeo.eclipse.dep.rap/pom.xml similarity index 98% rename from base/dep/org.argeo.eclipse.dep.rap/pom.xml rename to dep/org.argeo.eclipse.dep.rap/pom.xml index 6ce432b4a..05675e210 100644 --- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml +++ b/dep/org.argeo.eclipse.dep.rap/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons dep 2.1.12-SNAPSHOT .. @@ -152,7 +152,7 @@ - + diff --git a/base/dep/org.argeo.eclipse.dep.rcp/p2.inf b/dep/org.argeo.eclipse.dep.rcp/p2.inf similarity index 100% rename from base/dep/org.argeo.eclipse.dep.rcp/p2.inf rename to dep/org.argeo.eclipse.dep.rcp/p2.inf diff --git a/base/dep/org.argeo.eclipse.dep.rcp/pom.xml b/dep/org.argeo.eclipse.dep.rcp/pom.xml similarity index 99% rename from base/dep/org.argeo.eclipse.dep.rcp/pom.xml rename to dep/org.argeo.eclipse.dep.rcp/pom.xml index 7142395e3..5035a4f42 100644 --- a/base/dep/org.argeo.eclipse.dep.rcp/pom.xml +++ b/dep/org.argeo.eclipse.dep.rcp/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons dep 2.1.12-SNAPSHOT .. diff --git a/security/dep/org.argeo.security.dep.node.eclipse/p2.inf b/dep/org.argeo.security.dep.node.eclipse/p2.inf similarity index 100% rename from security/dep/org.argeo.security.dep.node.eclipse/p2.inf rename to dep/org.argeo.security.dep.node.eclipse/p2.inf diff --git a/security/dep/org.argeo.security.dep.node.eclipse/pom.xml b/dep/org.argeo.security.dep.node.eclipse/pom.xml similarity index 89% rename from security/dep/org.argeo.security.dep.node.eclipse/pom.xml rename to dep/org.argeo.security.dep.node.eclipse/pom.xml index 5abb5f021..0ca4b1f93 100644 --- a/security/dep/org.argeo.security.dep.node.eclipse/pom.xml +++ b/dep/org.argeo.security.dep.node.eclipse/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -28,46 +28,46 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.jcr.ui.explorer 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.ui.explorer 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui.admin 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.jcr 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.equinox 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.dep.node 2.1.12-SNAPSHOT pom diff --git a/security/dep/org.argeo.security.dep.node.rap/p2.inf b/dep/org.argeo.security.dep.node.rap/p2.inf similarity index 100% rename from security/dep/org.argeo.security.dep.node.rap/p2.inf rename to dep/org.argeo.security.dep.node.rap/p2.inf diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/dep/org.argeo.security.dep.node.rap/pom.xml similarity index 89% rename from security/dep/org.argeo.security.dep.node.rap/pom.xml rename to dep/org.argeo.security.dep.node.rap/pom.xml index 728f22e56..b3ea1f45c 100644 --- a/security/dep/org.argeo.security.dep.node.rap/pom.xml +++ b/dep/org.argeo.security.dep.node.rap/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -37,47 +37,47 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.jcr.ui.explorer 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.ui.explorer 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui.admin 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.mvc 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.dep.node 2.1.12-SNAPSHOT pom - org.argeo.commons.security + org.argeo.commons org.argeo.security.dao.jackrabbit - org.argeo.commons.security + org.argeo.commons org.argeo.security.dao.os - org.argeo.commons.server + org.argeo.commons org.argeo.server.catalina.start - org.argeo.commons.server + org.argeo.commons org.argeo.server.webextender @@ -91,14 +91,14 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui.rap 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/security/dep/org.argeo.security.dep.node.rap/src/assembly/dist.xml b/dep/org.argeo.security.dep.node.rap/src/assembly/dist.xml similarity index 100% rename from security/dep/org.argeo.security.dep.node.rap/src/assembly/dist.xml rename to dep/org.argeo.security.dep.node.rap/src/assembly/dist.xml diff --git a/security/dep/org.argeo.security.dep.node.rcp/p2.inf b/dep/org.argeo.security.dep.node.rcp/p2.inf similarity index 100% rename from security/dep/org.argeo.security.dep.node.rcp/p2.inf rename to dep/org.argeo.security.dep.node.rcp/p2.inf diff --git a/security/dep/org.argeo.security.dep.node.rcp/pom.xml b/dep/org.argeo.security.dep.node.rcp/pom.xml similarity index 94% rename from security/dep/org.argeo.security.dep.node.rcp/pom.xml rename to dep/org.argeo.security.dep.node.rcp/pom.xml index d94b6040d..53a712510 100644 --- a/security/dep/org.argeo.security.dep.node.rcp/pom.xml +++ b/dep/org.argeo.security.dep.node.rcp/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -36,13 +36,13 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.dep.node.eclipse 2.1.12-SNAPSHOT pom - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui.rcp 2.1.12-SNAPSHOT @@ -73,7 +73,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/security/dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml b/dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml similarity index 100% rename from security/dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml rename to dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml diff --git a/security/dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml b/dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml similarity index 100% rename from security/dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml rename to dep/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml diff --git a/security/dep/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml b/dep/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml similarity index 100% rename from security/dep/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml rename to dep/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml diff --git a/security/dep/org.argeo.security.dep.node/p2.inf b/dep/org.argeo.security.dep.node/p2.inf similarity index 100% rename from security/dep/org.argeo.security.dep.node/p2.inf rename to dep/org.argeo.security.dep.node/p2.inf diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/dep/org.argeo.security.dep.node/pom.xml similarity index 87% rename from security/dep/org.argeo.security.dep.node/pom.xml rename to dep/org.argeo.security.dep.node/pom.xml index 09c3f3bdf..797558a05 100644 --- a/security/dep/org.argeo.security.dep.node/pom.xml +++ b/dep/org.argeo.security.dep.node/pom.xml @@ -1,8 +1,9 @@ - + 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -38,21 +39,21 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.node.repo.jackrabbit 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom @@ -60,14 +61,14 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.core 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT @@ -144,12 +145,12 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.jackrabbit 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.jackrabbit 2.1.12-SNAPSHOT @@ -162,31 +163,31 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.dao.ldap 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.auth.ldap 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.ldap 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.dao.jackrabbit 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.dao.os 2.1.12-SNAPSHOT @@ -200,24 +201,24 @@ org.argeo.tp org.springframework.osgi.web - - org.argeo.commons.server - org.argeo.server.dep.tomcat - 2.1.12-SNAPSHOT - pom - - - org.argeo.commons.server - org.argeo.server.webextender - 2.1.12-SNAPSHOT - - - org.argeo.commons.server + + + + + + + + + + + + + org.argeo.commons org.argeo.server.jcr.mvc 2.1.12-SNAPSHOT - org.argeo.commons.server + org.argeo.commons org.argeo.jackrabbit.webapp 2.1.12-SNAPSHOT @@ -238,25 +239,25 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.dep.ads 2.1.12-SNAPSHOT pom - org.argeo.commons.server + org.argeo.commons org.argeo.server.ads.server 2.1.12-SNAPSHOT - org.argeo.commons.server + org.argeo.commons org.argeo.server.ads 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.support.junit 2.1.12-SNAPSHOT @@ -287,7 +288,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/dep/org.argeo.server.dep.ads/pom.xml similarity index 92% rename from server/dep/org.argeo.server.dep.ads/pom.xml rename to dep/org.argeo.server.dep.ads/pom.xml index 2de5b8313..d1341e000 100644 --- a/server/dep/org.argeo.server.dep.ads/pom.xml +++ b/dep/org.argeo.server.dep.ads/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -12,7 +12,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom @@ -40,7 +40,7 @@ jdbm - org.argeo.commons.server + org.argeo.commons org.argeo.ext.jdbm 2.1.12-SNAPSHOT diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/dep/org.argeo.server.dep.jackrabbit.server/pom.xml similarity index 96% rename from server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml rename to dep/org.argeo.server.dep.jackrabbit.server/pom.xml index 6fd745180..d9561a296 100644 --- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml +++ b/dep/org.argeo.server.dep.jackrabbit.server/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -11,7 +11,7 @@ Commons Jackrabbit Dependencies - org.argeo.commons.base + org.argeo.commons org.argeo.dep.jackrabbit pom 2.1.12-SNAPSHOT diff --git a/base/dep/pom.xml b/dep/pom.xml similarity index 79% rename from base/dep/pom.xml rename to dep/pom.xml index 3ef6c4a52..be0882915 100644 --- a/base/dep/pom.xml +++ b/dep/pom.xml @@ -3,11 +3,10 @@ 4.0.0 org.argeo.commons - base + argeo-commons 2.1.12-SNAPSHOT .. - org.argeo.commons.base dep Commons Base Dependencies pom @@ -16,6 +15,12 @@ org.argeo.dep.jackrabbit org.argeo.eclipse.dep.rap org.argeo.eclipse.dep.rcp + org.argeo.server.dep.ads + org.argeo.server.dep.jackrabbit.server + org.argeo.security.dep.node + org.argeo.security.dep.node.eclipse + org.argeo.security.dep.node.rap + org.argeo.security.dep.node.rcp @@ -47,7 +52,7 @@ check-osgi - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/base/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml similarity index 98% rename from base/dist/osgi-boot/pom.xml rename to dist/osgi-boot/pom.xml index b2b97e1a6..7f5094ffe 100644 --- a/base/dist/osgi-boot/pom.xml +++ b/dist/osgi-boot/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT dist .. @@ -33,7 +33,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT diff --git a/base/dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-init-functions.sh b/dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-init-functions.sh similarity index 100% rename from base/dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-init-functions.sh rename to dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-init-functions.sh diff --git a/base/dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-settings.sh b/dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-settings.sh similarity index 100% rename from base/dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-settings.sh rename to dist/osgi-boot/src/main/rpm/etc/osgiboot/osgi-service-settings.sh diff --git a/base/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service similarity index 100% rename from base/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service rename to dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service diff --git a/base/dist/pom.xml b/dist/pom.xml similarity index 80% rename from base/dist/pom.xml rename to dist/pom.xml index 5d33b1e46..5286dbb9d 100644 --- a/base/dist/pom.xml +++ b/dist/pom.xml @@ -3,13 +3,12 @@ 4.0.0 org.argeo.commons - base + argeo-commons 2.1.12-SNAPSHOT .. - org.argeo.commons.base dist - Commons Base Distributions + Commons Distributions pom osgi-boot diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/.classpath b/org.argeo.eclipse.ui.jcr/.classpath similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/.classpath rename to org.argeo.eclipse.ui.jcr/.classpath diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/.project b/org.argeo.eclipse.ui.jcr/.project similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/.project rename to org.argeo.eclipse.ui.jcr/.project diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/.settings/org.eclipse.jdt.core.prefs b/org.argeo.eclipse.ui.jcr/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.eclipse.ui.jcr/.settings/org.eclipse.jdt.core.prefs diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/.settings/org.eclipse.pde.core.prefs b/org.argeo.eclipse.ui.jcr/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/.settings/org.eclipse.pde.core.prefs rename to org.argeo.eclipse.ui.jcr/.settings/org.eclipse.pde.core.prefs diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/build.properties b/org.argeo.eclipse.ui.jcr/build.properties similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/build.properties rename to org.argeo.eclipse.ui.jcr/build.properties diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/binary.png b/org.argeo.eclipse.ui.jcr/icons/binary.png similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/binary.png rename to org.argeo.eclipse.ui.jcr/icons/binary.png diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/file.gif b/org.argeo.eclipse.ui.jcr/icons/file.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/file.gif rename to org.argeo.eclipse.ui.jcr/icons/file.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/folder.gif b/org.argeo.eclipse.ui.jcr/icons/folder.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/folder.gif rename to org.argeo.eclipse.ui.jcr/icons/folder.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/home.gif b/org.argeo.eclipse.ui.jcr/icons/home.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/home.gif rename to org.argeo.eclipse.ui.jcr/icons/home.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/node.gif b/org.argeo.eclipse.ui.jcr/icons/node.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/node.gif rename to org.argeo.eclipse.ui.jcr/icons/node.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/remote_connected.gif b/org.argeo.eclipse.ui.jcr/icons/remote_connected.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/remote_connected.gif rename to org.argeo.eclipse.ui.jcr/icons/remote_connected.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/remote_disconnected.gif b/org.argeo.eclipse.ui.jcr/icons/remote_disconnected.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/remote_disconnected.gif rename to org.argeo.eclipse.ui.jcr/icons/remote_disconnected.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/repositories.gif b/org.argeo.eclipse.ui.jcr/icons/repositories.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/repositories.gif rename to org.argeo.eclipse.ui.jcr/icons/repositories.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/repository_connected.gif b/org.argeo.eclipse.ui.jcr/icons/repository_connected.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/repository_connected.gif rename to org.argeo.eclipse.ui.jcr/icons/repository_connected.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/repository_disconnected.gif b/org.argeo.eclipse.ui.jcr/icons/repository_disconnected.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/repository_disconnected.gif rename to org.argeo.eclipse.ui.jcr/icons/repository_disconnected.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/sort.gif b/org.argeo.eclipse.ui.jcr/icons/sort.gif similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/sort.gif rename to org.argeo.eclipse.ui.jcr/icons/sort.gif diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/workspace_connected.png b/org.argeo.eclipse.ui.jcr/icons/workspace_connected.png similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/workspace_connected.png rename to org.argeo.eclipse.ui.jcr/icons/workspace_connected.png diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/icons/workspace_disconnected.png b/org.argeo.eclipse.ui.jcr/icons/workspace_disconnected.png similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/icons/workspace_disconnected.png rename to org.argeo.eclipse.ui.jcr/icons/workspace_disconnected.png diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml b/org.argeo.eclipse.ui.jcr/pom.xml similarity index 88% rename from base/runtime/org.argeo.eclipse.ui.jcr/pom.xml rename to org.argeo.eclipse.ui.jcr/pom.xml index 540812813..b46700283 100644 --- a/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml +++ b/org.argeo.eclipse.ui.jcr/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT - runtime + argeo-commons .. org.argeo.eclipse.ui.jcr @@ -43,7 +43,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui 2.1.12-SNAPSHOT @@ -54,20 +54,20 @@ javax.jcr - org.argeo.commons.server + org.argeo.commons org.argeo.server.jcr 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.rcp 2.1.12-SNAPSHOT provided @@ -75,7 +75,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java b/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java rename to org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/src/main/resources/org/argeo/eclipse/ui/jcr/messages.properties b/org.argeo.eclipse.ui.jcr/src/main/resources/org/argeo/eclipse/ui/jcr/messages.properties similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.jcr/src/main/resources/org/argeo/eclipse/ui/jcr/messages.properties rename to org.argeo.eclipse.ui.jcr/src/main/resources/org/argeo/eclipse/ui/jcr/messages.properties diff --git a/base/runtime/org.argeo.eclipse.ui.rap/.classpath b/org.argeo.eclipse.ui.rap/.classpath similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/.classpath rename to org.argeo.eclipse.ui.rap/.classpath diff --git a/base/runtime/org.argeo.eclipse.ui.rap/.project b/org.argeo.eclipse.ui.rap/.project similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/.project rename to org.argeo.eclipse.ui.rap/.project diff --git a/base/runtime/org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs b/org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs diff --git a/base/runtime/org.argeo.eclipse.ui.rap/build.properties b/org.argeo.eclipse.ui.rap/build.properties similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/build.properties rename to org.argeo.eclipse.ui.rap/build.properties diff --git a/base/runtime/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml similarity index 93% rename from base/runtime/org.argeo.eclipse.ui.rap/pom.xml rename to org.argeo.eclipse.ui.rap/pom.xml index 8a340474a..3f47275f0 100644 --- a/base/runtime/org.argeo.eclipse.ui.rap/pom.xml +++ b/org.argeo.eclipse.ui.rap/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT - runtime + argeo-commons .. org.argeo.eclipse.ui.rap @@ -57,14 +57,14 @@ org.eclipse.jface.dialogs, --> - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rap 2.1.12-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java rename to org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/.classpath b/org.argeo.eclipse.ui.rcp/.classpath similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/.classpath rename to org.argeo.eclipse.ui.rcp/.classpath diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/.project b/org.argeo.eclipse.ui.rcp/.project similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/.project rename to org.argeo.eclipse.ui.rcp/.project diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs b/org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/build.properties b/org.argeo.eclipse.ui.rcp/build.properties similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/build.properties rename to org.argeo.eclipse.ui.rcp/build.properties diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/org.argeo.eclipse.ui.rcp/pom.xml similarity index 91% rename from base/runtime/org.argeo.eclipse.ui.rcp/pom.xml rename to org.argeo.eclipse.ui.rcp/pom.xml index 94da11781..c86cb6a19 100644 --- a/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml +++ b/org.argeo.eclipse.ui.rcp/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT - runtime + argeo-commons .. org.argeo.eclipse.ui.rcp @@ -50,21 +50,21 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java rename to org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java diff --git a/base/runtime/org.argeo.eclipse.ui/.classpath b/org.argeo.eclipse.ui/.classpath similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/.classpath rename to org.argeo.eclipse.ui/.classpath diff --git a/base/runtime/org.argeo.eclipse.ui/.project b/org.argeo.eclipse.ui/.project similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/.project rename to org.argeo.eclipse.ui/.project diff --git a/base/runtime/org.argeo.eclipse.ui/.settings/org.eclipse.jdt.core.prefs b/org.argeo.eclipse.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.eclipse.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/base/runtime/org.argeo.eclipse.ui/.settings/org.eclipse.pde.core.prefs b/org.argeo.eclipse.ui/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/.settings/org.eclipse.pde.core.prefs rename to org.argeo.eclipse.ui/.settings/org.eclipse.pde.core.prefs diff --git a/base/runtime/org.argeo.eclipse.ui/build.properties b/org.argeo.eclipse.ui/build.properties similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/build.properties rename to org.argeo.eclipse.ui/build.properties diff --git a/base/runtime/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml similarity index 93% rename from base/runtime/org.argeo.eclipse.ui/pom.xml rename to org.argeo.eclipse.ui/pom.xml index 53c87d6a8..899e271a8 100644 --- a/base/runtime/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.eclipse.ui/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT - runtime + argeo-commons .. org.argeo.eclipse.ui @@ -55,7 +55,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided @@ -63,7 +63,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/AbstractTreeContentProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/AbstractTreeContentProvider.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/AbstractTreeContentProvider.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/AbstractTreeContentProvider.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ArgeoUiPlugin.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ArgeoUiPlugin.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ArgeoUiPlugin.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ArgeoUiPlugin.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ColumnViewerComparator.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ColumnViewerComparator.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ColumnViewerComparator.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ColumnViewerComparator.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseArgeoMonitor.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseArgeoMonitor.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseArgeoMonitor.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseArgeoMonitor.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseUiUtils.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseUiUtils.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseUiUtils.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/EclipseUiUtils.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/GenericTableComparator.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/GenericTableComparator.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/GenericTableComparator.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/GenericTableComparator.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/CommandUtils.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/CommandUtils.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/CommandUtils.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/CommandUtils.java diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/ViewerUtils.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/ViewerUtils.java similarity index 100% rename from base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/ViewerUtils.java rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/utils/ViewerUtils.java diff --git a/server/modules/org.argeo.ext.jdbm/.project b/org.argeo.ext.jdbm/.project similarity index 100% rename from server/modules/org.argeo.ext.jdbm/.project rename to org.argeo.ext.jdbm/.project diff --git a/security/modules/org.argeo.security.auth.ldap/build.properties b/org.argeo.ext.jdbm/build.properties similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/build.properties rename to org.argeo.ext.jdbm/build.properties diff --git a/server/modules/org.argeo.ext.jdbm/pom.xml b/org.argeo.ext.jdbm/pom.xml similarity index 92% rename from server/modules/org.argeo.ext.jdbm/pom.xml rename to org.argeo.ext.jdbm/pom.xml index 876568ea7..4c1c02f33 100644 --- a/server/modules/org.argeo.ext.jdbm/pom.xml +++ b/org.argeo.ext.jdbm/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.ext.jdbm diff --git a/server/modules/org.argeo.jackrabbit.webapp/.project b/org.argeo.jackrabbit.webapp/.project similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/.project rename to org.argeo.jackrabbit.webapp/.project diff --git a/server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs b/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs rename to org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml b/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml b/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml b/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/org.argeo.jackrabbit.webapp/WEB-INF/web.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/web.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml b/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml b/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml rename to org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml diff --git a/security/modules/org.argeo.security.dao.jackrabbit/build.properties b/org.argeo.jackrabbit.webapp/build.properties similarity index 100% rename from security/modules/org.argeo.security.dao.jackrabbit/build.properties rename to org.argeo.jackrabbit.webapp/build.properties diff --git a/server/modules/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties b/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties rename to org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties diff --git a/server/modules/org.argeo.jackrabbit.webapp/pom.xml b/org.argeo.jackrabbit.webapp/pom.xml similarity index 95% rename from server/modules/org.argeo.jackrabbit.webapp/pom.xml rename to org.argeo.jackrabbit.webapp/pom.xml index 3d70d939b..38db5a180 100644 --- a/server/modules/org.argeo.jackrabbit.webapp/pom.xml +++ b/org.argeo.jackrabbit.webapp/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.jackrabbit.webapp diff --git a/server/plugins/org.argeo.jcr.ui.explorer/.classpath b/org.argeo.jcr.ui.explorer/.classpath similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/.classpath rename to org.argeo.jcr.ui.explorer/.classpath diff --git a/server/plugins/org.argeo.jcr.ui.explorer/.project b/org.argeo.jcr.ui.explorer/.project similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/.project rename to org.argeo.jcr.ui.explorer/.project diff --git a/server/plugins/org.argeo.jcr.ui.explorer/.settings/org.eclipse.jdt.core.prefs b/org.argeo.jcr.ui.explorer/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.jcr.ui.explorer/.settings/org.eclipse.jdt.core.prefs diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml b/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml rename to org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/editors.xml b/org.argeo.jcr.ui.explorer/META-INF/spring/editors.xml similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/editors.xml rename to org.argeo.jcr.ui.explorer/META-INF/spring/editors.xml diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml b/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml rename to org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml b/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml rename to org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/views.xml b/org.argeo.jcr.ui.explorer/META-INF/spring/views.xml similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/views.xml rename to org.argeo.jcr.ui.explorer/META-INF/spring/views.xml diff --git a/server/plugins/org.argeo.jcr.ui.explorer/build.properties b/org.argeo.jcr.ui.explorer/build.properties similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/build.properties rename to org.argeo.jcr.ui.explorer/build.properties diff --git a/security/plugins/org.argeo.security.ui.admin/icons/add.gif b/org.argeo.jcr.ui.explorer/icons/add.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/add.gif rename to org.argeo.jcr.ui.explorer/icons/add.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/addFolder.gif b/org.argeo.jcr.ui.explorer/icons/addFolder.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/addFolder.gif rename to org.argeo.jcr.ui.explorer/icons/addFolder.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/addPrivileges.png b/org.argeo.jcr.ui.explorer/icons/addPrivileges.png similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/addPrivileges.png rename to org.argeo.jcr.ui.explorer/icons/addPrivileges.png diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/addRepo.gif b/org.argeo.jcr.ui.explorer/icons/addRepo.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/addRepo.gif rename to org.argeo.jcr.ui.explorer/icons/addRepo.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/addWorkspace.png b/org.argeo.jcr.ui.explorer/icons/addWorkspace.png similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/addWorkspace.png rename to org.argeo.jcr.ui.explorer/icons/addWorkspace.png diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/browser.gif b/org.argeo.jcr.ui.explorer/icons/browser.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/browser.gif rename to org.argeo.jcr.ui.explorer/icons/browser.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/dumpNode.gif b/org.argeo.jcr.ui.explorer/icons/dumpNode.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/dumpNode.gif rename to org.argeo.jcr.ui.explorer/icons/dumpNode.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/getSize.gif b/org.argeo.jcr.ui.explorer/icons/getSize.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/getSize.gif rename to org.argeo.jcr.ui.explorer/icons/getSize.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/import_fs.png b/org.argeo.jcr.ui.explorer/icons/import_fs.png similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/import_fs.png rename to org.argeo.jcr.ui.explorer/icons/import_fs.png diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/nodes.gif b/org.argeo.jcr.ui.explorer/icons/nodes.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/nodes.gif rename to org.argeo.jcr.ui.explorer/icons/nodes.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/query.png b/org.argeo.jcr.ui.explorer/icons/query.png similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/query.png rename to org.argeo.jcr.ui.explorer/icons/query.png diff --git a/security/plugins/org.argeo.security.ui.admin/icons/refresh.png b/org.argeo.jcr.ui.explorer/icons/refresh.png similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/refresh.png rename to org.argeo.jcr.ui.explorer/icons/refresh.png diff --git a/security/plugins/org.argeo.security.ui.admin/icons/remove.gif b/org.argeo.jcr.ui.explorer/icons/remove.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/remove.gif rename to org.argeo.jcr.ui.explorer/icons/remove.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/repositories.gif b/org.argeo.jcr.ui.explorer/icons/repositories.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/repositories.gif rename to org.argeo.jcr.ui.explorer/icons/repositories.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/sort.gif b/org.argeo.jcr.ui.explorer/icons/sort.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/sort.gif rename to org.argeo.jcr.ui.explorer/icons/sort.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/plugin.properties b/org.argeo.jcr.ui.explorer/plugin.properties similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/plugin.properties rename to org.argeo.jcr.ui.explorer/plugin.properties diff --git a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml b/org.argeo.jcr.ui.explorer/plugin.xml similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/plugin.xml rename to org.argeo.jcr.ui.explorer/plugin.xml diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/org.argeo.jcr.ui.explorer/pom.xml similarity index 78% rename from server/plugins/org.argeo.jcr.ui.explorer/pom.xml rename to org.argeo.jcr.ui.explorer/pom.xml index dfcc1a8d4..d84d699a6 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml +++ b/org.argeo.jcr.ui.explorer/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.jcr.ui.explorer @@ -15,6 +16,7 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true lazy plugin org.argeo.jcr.ui.explorer.JcrExplorerPlugin @@ -34,25 +36,25 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.jcr 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.rcp 2.1.12-SNAPSHOT provided diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerConstants.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerConstants.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerConstants.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerConstants.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPerspective.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPerspective.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPerspective.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPerspective.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPlugin.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPlugin.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPlugin.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerPlugin.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerView.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerView.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerView.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/JcrExplorerView.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/PropertiesContentProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/PropertiesContentProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/PropertiesContentProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/PropertiesContentProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddFolderNode.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddFolderNode.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddFolderNode.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddFolderNode.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddPrivileges.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddPrivileges.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddPrivileges.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddPrivileges.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/CreateWorkspace.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/CreateWorkspace.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/CreateWorkspace.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/CreateWorkspace.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DumpNode.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DumpNode.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DumpNode.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DumpNode.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/GetNodeSize.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/GetNodeSize.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/GetNodeSize.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/GetNodeSize.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/Refresh.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/Refresh.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/Refresh.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/Refresh.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/RemoveRemoteRepository.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/RemoveRemoteRepository.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/RemoveRemoteRepository.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/RemoveRemoteRepository.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/SortChildNodes.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/SortChildNodes.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/SortChildNodes.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/SortChildNodes.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/dialogs/ChooseNameDialog.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/dialogs/ChooseNameDialog.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/dialogs/ChooseNameDialog.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/dialogs/ChooseNameDialog.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/ChildNodesPage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/ChildNodesPage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/ChildNodesPage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/ChildNodesPage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/EmptyNodePage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/EmptyNodePage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/EmptyNodePage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/EmptyNodePage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericJcrQueryEditor.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericJcrQueryEditor.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericJcrQueryEditor.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericJcrQueryEditor.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditor.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditor.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditor.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditor.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditorInput.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditorInput.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditorInput.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodeEditorInput.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodePage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodePage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodePage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericNodePage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericPropertyPage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericPropertyPage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericPropertyPage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/GenericPropertyPage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeRightsManagementPage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeRightsManagementPage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeRightsManagementPage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeRightsManagementPage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeVersionHistoryPage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeVersionHistoryPage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeVersionHistoryPage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/NodeVersionHistoryPage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/StringNodeEditorInput.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/StringNodeEditorInput.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/StringNodeEditorInput.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/editors/StringNodeEditorInput.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/MaintainedRepositoryElem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/MaintainedRepositoryElem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/MaintainedRepositoryElem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/MaintainedRepositoryElem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RemoteRepositoryElem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RemoteRepositoryElem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RemoteRepositoryElem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RemoteRepositoryElem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoriesElem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoriesElem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoriesElem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoriesElem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoryElem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoryElem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoryElem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/RepositoryElem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/SingleJcrNodeElem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/SingleJcrNodeElem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/SingleJcrNodeElem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/SingleJcrNodeElem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceElem.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceElem.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceElem.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceElem.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/FullVersioningTreeContentProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/FullVersioningTreeContentProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/FullVersioningTreeContentProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/FullVersioningTreeContentProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/PropertyLabelProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/PropertyLabelProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/PropertyLabelProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/PropertyLabelProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/SingleNodeAsTreeContentProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/SingleNodeAsTreeContentProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/SingleNodeAsTreeContentProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/SingleNodeAsTreeContentProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/VersionLabelProvider.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/VersionLabelProvider.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/VersionLabelProvider.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/providers/VersionLabelProvider.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/TreeObjectsComparator.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/TreeObjectsComparator.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/TreeObjectsComparator.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/TreeObjectsComparator.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChangeRightsWizard.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChangeRightsWizard.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChangeRightsWizard.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChangeRightsWizard.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChooseRightsPage.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChooseRightsPage.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChooseRightsPage.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ChooseRightsPage.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java b/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java rename to org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/resources/org/argeo/jcr/ui/explorer/messages.properties b/org.argeo.jcr.ui.explorer/src/main/resources/org/argeo/jcr/ui/explorer/messages.properties similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/src/main/resources/org/argeo/jcr/ui/explorer/messages.properties rename to org.argeo.jcr.ui.explorer/src/main/resources/org/argeo/jcr/ui/explorer/messages.properties diff --git a/server/modules/org.argeo.node.repo.jackrabbit/.project b/org.argeo.node.repo.jackrabbit/.project similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/.project rename to org.argeo.node.repo.jackrabbit/.project diff --git a/server/modules/org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs b/org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs rename to org.argeo.node.repo.jackrabbit/.settings/org.eclipse.pde.core.prefs diff --git a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml b/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml rename to org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml diff --git a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml b/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml rename to org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml diff --git a/server/modules/org.argeo.node.repo.jackrabbit/build.properties b/org.argeo.node.repo.jackrabbit/build.properties similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/build.properties rename to org.argeo.node.repo.jackrabbit/build.properties diff --git a/server/modules/org.argeo.node.repo.jackrabbit/noderepo.properties b/org.argeo.node.repo.jackrabbit/noderepo.properties similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/noderepo.properties rename to org.argeo.node.repo.jackrabbit/noderepo.properties diff --git a/server/modules/org.argeo.node.repo.jackrabbit/pom.xml b/org.argeo.node.repo.jackrabbit/pom.xml similarity index 94% rename from server/modules/org.argeo.node.repo.jackrabbit/pom.xml rename to org.argeo.node.repo.jackrabbit/pom.xml index 0ac05cc8f..d35367eee 100644 --- a/server/modules/org.argeo.node.repo.jackrabbit/pom.xml +++ b/org.argeo.node.repo.jackrabbit/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.node.repo.jackrabbit diff --git a/server/modules/org.argeo.node.repo.jackrabbit/repository-h2.xml b/org.argeo.node.repo.jackrabbit/repository-h2.xml similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/repository-h2.xml rename to org.argeo.node.repo.jackrabbit/repository-h2.xml diff --git a/server/modules/org.argeo.node.repo.jackrabbit/repository-memory.xml b/org.argeo.node.repo.jackrabbit/repository-memory.xml similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/repository-memory.xml rename to org.argeo.node.repo.jackrabbit/repository-memory.xml diff --git a/server/modules/org.argeo.node.repo.jackrabbit/repository-mysql.xml b/org.argeo.node.repo.jackrabbit/repository-mysql.xml similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/repository-mysql.xml rename to org.argeo.node.repo.jackrabbit/repository-mysql.xml diff --git a/server/modules/org.argeo.node.repo.jackrabbit/repository-postgresql.xml b/org.argeo.node.repo.jackrabbit/repository-postgresql.xml similarity index 100% rename from server/modules/org.argeo.node.repo.jackrabbit/repository-postgresql.xml rename to org.argeo.node.repo.jackrabbit/repository-postgresql.xml diff --git a/base/runtime/org.argeo.osgi.boot/.classpath b/org.argeo.osgi.boot/.classpath similarity index 100% rename from base/runtime/org.argeo.osgi.boot/.classpath rename to org.argeo.osgi.boot/.classpath diff --git a/base/runtime/org.argeo.osgi.boot/.project b/org.argeo.osgi.boot/.project similarity index 100% rename from base/runtime/org.argeo.osgi.boot/.project rename to org.argeo.osgi.boot/.project diff --git a/base/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs b/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs diff --git a/base/runtime/org.argeo.osgi.boot/build.properties b/org.argeo.osgi.boot/build.properties similarity index 100% rename from base/runtime/org.argeo.osgi.boot/build.properties rename to org.argeo.osgi.boot/build.properties diff --git a/base/runtime/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml similarity index 94% rename from base/runtime/org.argeo.osgi.boot/pom.xml rename to org.argeo.osgi.boot/pom.xml index 1f91093b0..eae04e72f 100644 --- a/base/runtime/org.argeo.osgi.boot/pom.xml +++ b/org.argeo.osgi.boot/pom.xml @@ -2,9 +2,9 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT - runtime + argeo-commons .. org.argeo.osgi.boot diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/DistributionBundle.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/DistributionBundle.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/DistributionBundle.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/DistributionBundle.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootException.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootException.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootException.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootException.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java b/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java rename to org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar b/org.argeo.osgi.boot/src/test/bundles/jars/test.jar similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar rename to org.argeo.osgi.boot/src/test/bundles/jars/test.jar diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF b/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF rename to org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF b/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF rename to org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF b/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF rename to org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF b/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF rename to org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF diff --git a/base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java b/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java rename to org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java diff --git a/base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java similarity index 100% rename from base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java rename to org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java diff --git a/base/plugins/org.argeo.osgi.ui.explorer/.classpath b/org.argeo.osgi.ui.explorer/.classpath similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/.classpath rename to org.argeo.osgi.ui.explorer/.classpath diff --git a/base/plugins/org.argeo.osgi.ui.explorer/.project b/org.argeo.osgi.ui.explorer/.project similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/.project rename to org.argeo.osgi.ui.explorer/.project diff --git a/base/plugins/org.argeo.osgi.ui.explorer/.settings/org.eclipse.jdt.core.prefs b/org.argeo.osgi.ui.explorer/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.osgi.ui.explorer/.settings/org.eclipse.jdt.core.prefs diff --git a/base/plugins/org.argeo.osgi.ui.explorer/build.properties b/org.argeo.osgi.ui.explorer/build.properties similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/build.properties rename to org.argeo.osgi.ui.explorer/build.properties diff --git a/base/plugins/org.argeo.osgi.ui.explorer/icons/active.gif b/org.argeo.osgi.ui.explorer/icons/active.gif similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/icons/active.gif rename to org.argeo.osgi.ui.explorer/icons/active.gif diff --git a/base/plugins/org.argeo.osgi.ui.explorer/icons/bundles.gif b/org.argeo.osgi.ui.explorer/icons/bundles.gif similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/icons/bundles.gif rename to org.argeo.osgi.ui.explorer/icons/bundles.gif diff --git a/base/plugins/org.argeo.osgi.ui.explorer/icons/installed.gif b/org.argeo.osgi.ui.explorer/icons/installed.gif similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/icons/installed.gif rename to org.argeo.osgi.ui.explorer/icons/installed.gif diff --git a/base/plugins/org.argeo.osgi.ui.explorer/icons/osgi_explorer.gif b/org.argeo.osgi.ui.explorer/icons/osgi_explorer.gif similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/icons/osgi_explorer.gif rename to org.argeo.osgi.ui.explorer/icons/osgi_explorer.gif diff --git a/base/plugins/org.argeo.osgi.ui.explorer/icons/resolved.gif b/org.argeo.osgi.ui.explorer/icons/resolved.gif similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/icons/resolved.gif rename to org.argeo.osgi.ui.explorer/icons/resolved.gif diff --git a/base/plugins/org.argeo.osgi.ui.explorer/icons/starting.gif b/org.argeo.osgi.ui.explorer/icons/starting.gif similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/icons/starting.gif rename to org.argeo.osgi.ui.explorer/icons/starting.gif diff --git a/base/plugins/org.argeo.osgi.ui.explorer/plugin.xml b/org.argeo.osgi.ui.explorer/plugin.xml similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/plugin.xml rename to org.argeo.osgi.ui.explorer/plugin.xml diff --git a/base/plugins/org.argeo.osgi.ui.explorer/pom.xml b/org.argeo.osgi.ui.explorer/pom.xml similarity index 85% rename from base/plugins/org.argeo.osgi.ui.explorer/pom.xml rename to org.argeo.osgi.ui.explorer/pom.xml index 2c380895d..fcdc73c78 100644 --- a/base/plugins/org.argeo.osgi.ui.explorer/pom.xml +++ b/org.argeo.osgi.ui.explorer/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.base + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.osgi.ui.explorer @@ -15,6 +15,7 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true lazy org.argeo.osgi.ui.explorer.OsgiExplorerPlugin org.eclipse.ui;resolution:=optional, @@ -34,20 +35,20 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.rcp 2.1.12-SNAPSHOT provided diff --git a/base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerImages.java b/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerImages.java similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerImages.java rename to org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerImages.java diff --git a/base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPerspective.java b/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPerspective.java similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPerspective.java rename to org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPerspective.java diff --git a/base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPlugin.java b/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPlugin.java similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPlugin.java rename to org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/OsgiExplorerPlugin.java diff --git a/base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java b/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java rename to org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java diff --git a/base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/ModulesView.java b/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/ModulesView.java similarity index 100% rename from base/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/ModulesView.java rename to org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/ModulesView.java diff --git a/security/modules/org.argeo.security.auth.ldap/.project b/org.argeo.security.auth.ldap/.project similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/.project rename to org.argeo.security.auth.ldap/.project diff --git a/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml rename to org.argeo.security.auth.ldap/META-INF/spring/security-ldap-jcr.xml diff --git a/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml rename to org.argeo.security.auth.ldap/META-INF/spring/security-ldap-osgi.xml diff --git a/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml rename to org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml diff --git a/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml rename to org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml diff --git a/security/modules/org.argeo.security.dao.ldap/build.properties b/org.argeo.security.auth.ldap/build.properties similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/build.properties rename to org.argeo.security.auth.ldap/build.properties diff --git a/security/modules/org.argeo.security.auth.ldap/ldap.properties b/org.argeo.security.auth.ldap/ldap.properties similarity index 100% rename from security/modules/org.argeo.security.auth.ldap/ldap.properties rename to org.argeo.security.auth.ldap/ldap.properties diff --git a/security/modules/org.argeo.security.auth.ldap/pom.xml b/org.argeo.security.auth.ldap/pom.xml similarity index 90% rename from security/modules/org.argeo.security.auth.ldap/pom.xml rename to org.argeo.security.auth.ldap/pom.xml index a6c8a07b6..a4410a91f 100644 --- a/security/modules/org.argeo.security.auth.ldap/pom.xml +++ b/org.argeo.security.auth.ldap/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.security.auth.ldap diff --git a/security/runtime/org.argeo.security.core/.classpath b/org.argeo.security.core/.classpath similarity index 100% rename from security/runtime/org.argeo.security.core/.classpath rename to org.argeo.security.core/.classpath diff --git a/security/runtime/org.argeo.security.core/.project b/org.argeo.security.core/.project similarity index 100% rename from security/runtime/org.argeo.security.core/.project rename to org.argeo.security.core/.project diff --git a/security/runtime/org.argeo.security.core/META-INF/spring/logger.xml b/org.argeo.security.core/META-INF/spring/logger.xml similarity index 100% rename from security/runtime/org.argeo.security.core/META-INF/spring/logger.xml rename to org.argeo.security.core/META-INF/spring/logger.xml diff --git a/security/runtime/org.argeo.security.core/META-INF/spring/osgi.xml b/org.argeo.security.core/META-INF/spring/osgi.xml similarity index 100% rename from security/runtime/org.argeo.security.core/META-INF/spring/osgi.xml rename to org.argeo.security.core/META-INF/spring/osgi.xml diff --git a/security/runtime/org.argeo.security.core/build.properties b/org.argeo.security.core/build.properties similarity index 100% rename from security/runtime/org.argeo.security.core/build.properties rename to org.argeo.security.core/build.properties diff --git a/security/runtime/org.argeo.security.core/pom.xml b/org.argeo.security.core/pom.xml similarity index 88% rename from security/runtime/org.argeo.security.core/pom.xml rename to org.argeo.security.core/pom.xml index e2daa3826..6a57226b9 100644 --- a/security/runtime/org.argeo.security.core/pom.xml +++ b/org.argeo.security.core/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - org.argeo.commons.security - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -47,12 +47,12 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.server + org.argeo.commons org.argeo.server.jcr 2.1.12-SNAPSHOT @@ -116,18 +116,18 @@ test - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom test - - org.argeo.commons.server - org.argeo.server.json - 2.1.12-SNAPSHOT - test - + + + + + + org.argeo.tp com.springsource.json diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java b/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java rename to org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/OsAuthenticationToken.java b/org.argeo.security.core/src/main/java/org/argeo/security/OsAuthenticationToken.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/OsAuthenticationToken.java rename to org.argeo.security.core/src/main/java/org/argeo/security/OsAuthenticationToken.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SecurityUtils.java b/org.argeo.security.core/src/main/java/org/argeo/security/SecurityUtils.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SecurityUtils.java rename to org.argeo.security.core/src/main/java/org/argeo/security/SecurityUtils.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SystemAuthentication.java b/org.argeo.security.core/src/main/java/org/argeo/security/SystemAuthentication.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SystemAuthentication.java rename to org.argeo.security.core/src/main/java/org/argeo/security/SystemAuthentication.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SystemExecutionService.java b/org.argeo.security.core/src/main/java/org/argeo/security/SystemExecutionService.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SystemExecutionService.java rename to org.argeo.security.core/src/main/java/org/argeo/security/SystemExecutionService.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java b/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java rename to org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AbstractSystemExecution.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/AbstractSystemExecution.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AbstractSystemExecution.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/AbstractSystemExecution.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/AsyncSystemTaskExecutor.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/AuthenticationProvidersRegister.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/ConsoleCallbackHandler.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/InternalAuthentication.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsgiModuleLabel.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/OsgiModuleLabel.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsgiModuleLabel.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/OsgiModuleLabel.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java b/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java rename to org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/AbstractKeyring.java b/org.argeo.security.core/src/main/java/org/argeo/security/crypto/AbstractKeyring.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/AbstractKeyring.java rename to org.argeo.security.core/src/main/java/org/argeo/security/crypto/AbstractKeyring.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/CryptoKeyring.java b/org.argeo.security.core/src/main/java/org/argeo/security/crypto/CryptoKeyring.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/CryptoKeyring.java rename to org.argeo.security.core/src/main/java/org/argeo/security/crypto/CryptoKeyring.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java b/org.argeo.security.core/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java rename to org.argeo.security.core/src/main/java/org/argeo/security/crypto/KeyringLoginModule.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java b/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java rename to org.argeo.security.core/src/main/java/org/argeo/security/crypto/PBEKeySpecCallback.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java b/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java rename to org.argeo.security.core/src/main/java/org/argeo/security/crypto/PasswordBasedEncryption.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrSecurityModel.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrUserAdminService.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/SimpleJcrSecurityModel.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java b/org.argeo.security.core/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java rename to org.argeo.security.core/src/main/java/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/log4j/SecureLogger.java b/org.argeo.security.core/src/main/java/org/argeo/security/log4j/SecureLogger.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/log4j/SecureLogger.java rename to org.argeo.security.core/src/main/java/org/argeo/security/log4j/SecureLogger.java diff --git a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/PasswordSandbox.java b/org.argeo.security.core/src/test/java/org/argeo/security/PasswordSandbox.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/PasswordSandbox.java rename to org.argeo.security.core/src/test/java/org/argeo/security/PasswordSandbox.java diff --git a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java b/org.argeo.security.core/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java similarity index 100% rename from security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java rename to org.argeo.security.core/src/test/java/org/argeo/security/crypto/PasswordBasedEncryptionTest.java diff --git a/security/runtime/org.argeo.security.core/src/test/resources/log4j.properties b/org.argeo.security.core/src/test/resources/log4j.properties similarity index 100% rename from security/runtime/org.argeo.security.core/src/test/resources/log4j.properties rename to org.argeo.security.core/src/test/resources/log4j.properties diff --git a/security/runtime/org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json b/org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json similarity index 100% rename from security/runtime/org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json rename to org.argeo.security.core/src/test/resources/org/argeo/security/json/gandalf2.json diff --git a/security/modules/org.argeo.security.dao.cli/.project b/org.argeo.security.dao.cli/.project similarity index 100% rename from security/modules/org.argeo.security.dao.cli/.project rename to org.argeo.security.dao.cli/.project diff --git a/security/modules/org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml b/org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml similarity index 100% rename from security/modules/org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml rename to org.argeo.security.dao.cli/META-INF/spring/security-cli-osgi.xml diff --git a/security/modules/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml b/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml similarity index 100% rename from security/modules/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml rename to org.argeo.security.dao.cli/META-INF/spring/security-cli.xml diff --git a/security/modules/org.argeo.security.dao.cli/pom.xml b/org.argeo.security.dao.cli/pom.xml similarity index 88% rename from security/modules/org.argeo.security.dao.cli/pom.xml rename to org.argeo.security.dao.cli/pom.xml index c2ea1c6a1..c354eacbd 100644 --- a/security/modules/org.argeo.security.dao.cli/pom.xml +++ b/org.argeo.security.dao.cli/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.security.dao.cli diff --git a/security/modules/org.argeo.security.dao.cli/security.properties b/org.argeo.security.dao.cli/security.properties similarity index 100% rename from security/modules/org.argeo.security.dao.cli/security.properties rename to org.argeo.security.dao.cli/security.properties diff --git a/security/modules/org.argeo.security.dao.jackrabbit/.project b/org.argeo.security.dao.jackrabbit/.project similarity index 100% rename from security/modules/org.argeo.security.dao.jackrabbit/.project rename to org.argeo.security.dao.jackrabbit/.project diff --git a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/repofactory.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/repofactory.xml similarity index 100% rename from security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/repofactory.xml rename to org.argeo.security.dao.jackrabbit/META-INF/spring/repofactory.xml diff --git a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml similarity index 100% rename from security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml rename to org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-osgi.xml diff --git a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml similarity index 100% rename from security/modules/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml rename to org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml diff --git a/security/modules/org.argeo.security.dao.os/build.properties b/org.argeo.security.dao.jackrabbit/build.properties similarity index 100% rename from security/modules/org.argeo.security.dao.os/build.properties rename to org.argeo.security.dao.jackrabbit/build.properties diff --git a/security/modules/org.argeo.security.dao.jackrabbit/pom.xml b/org.argeo.security.dao.jackrabbit/pom.xml similarity index 86% rename from security/modules/org.argeo.security.dao.jackrabbit/pom.xml rename to org.argeo.security.dao.jackrabbit/pom.xml index 4d3658ef7..86f837e6a 100644 --- a/security/modules/org.argeo.security.dao.jackrabbit/pom.xml +++ b/org.argeo.security.dao.jackrabbit/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.security.dao.jackrabbit diff --git a/security/modules/org.argeo.security.dao.jackrabbit/security.properties b/org.argeo.security.dao.jackrabbit/security.properties similarity index 100% rename from security/modules/org.argeo.security.dao.jackrabbit/security.properties rename to org.argeo.security.dao.jackrabbit/security.properties diff --git a/security/modules/org.argeo.security.dao.ldap/.project b/org.argeo.security.dao.ldap/.project similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/.project rename to org.argeo.security.dao.ldap/.project diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml rename to org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml rename to org.argeo.security.dao.ldap/META-INF/spring/security-ldap-osgi.xml diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml rename to org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml rename to org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml diff --git a/server/modules/org.argeo.ext.jdbm/build.properties b/org.argeo.security.dao.ldap/build.properties similarity index 100% rename from server/modules/org.argeo.ext.jdbm/build.properties rename to org.argeo.security.dao.ldap/build.properties diff --git a/security/modules/org.argeo.security.dao.ldap/ldap.properties b/org.argeo.security.dao.ldap/ldap.properties similarity index 100% rename from security/modules/org.argeo.security.dao.ldap/ldap.properties rename to org.argeo.security.dao.ldap/ldap.properties diff --git a/security/modules/org.argeo.security.dao.ldap/pom.xml b/org.argeo.security.dao.ldap/pom.xml similarity index 90% rename from security/modules/org.argeo.security.dao.ldap/pom.xml rename to org.argeo.security.dao.ldap/pom.xml index c62f973c5..d4ca96c6b 100644 --- a/security/modules/org.argeo.security.dao.ldap/pom.xml +++ b/org.argeo.security.dao.ldap/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.security.dao.ldap diff --git a/security/modules/org.argeo.security.dao.os/.project b/org.argeo.security.dao.os/.project similarity index 100% rename from security/modules/org.argeo.security.dao.os/.project rename to org.argeo.security.dao.os/.project diff --git a/security/modules/org.argeo.security.dao.os/META-INF/spring/security-os-osgi.xml b/org.argeo.security.dao.os/META-INF/spring/security-os-osgi.xml similarity index 100% rename from security/modules/org.argeo.security.dao.os/META-INF/spring/security-os-osgi.xml rename to org.argeo.security.dao.os/META-INF/spring/security-os-osgi.xml diff --git a/security/modules/org.argeo.security.dao.os/META-INF/spring/security-os.xml b/org.argeo.security.dao.os/META-INF/spring/security-os.xml similarity index 100% rename from security/modules/org.argeo.security.dao.os/META-INF/spring/security-os.xml rename to org.argeo.security.dao.os/META-INF/spring/security-os.xml diff --git a/server/modules/org.argeo.jackrabbit.webapp/build.properties b/org.argeo.security.dao.os/build.properties similarity index 100% rename from server/modules/org.argeo.jackrabbit.webapp/build.properties rename to org.argeo.security.dao.os/build.properties diff --git a/security/modules/org.argeo.security.dao.os/pom.xml b/org.argeo.security.dao.os/pom.xml similarity index 88% rename from security/modules/org.argeo.security.dao.os/pom.xml rename to org.argeo.security.dao.os/pom.xml index fc599d877..7ec6fe6c3 100644 --- a/security/modules/org.argeo.security.dao.os/pom.xml +++ b/org.argeo.security.dao.os/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.security.dao.os diff --git a/security/modules/org.argeo.security.dao.os/security.properties b/org.argeo.security.dao.os/security.properties similarity index 100% rename from security/modules/org.argeo.security.dao.os/security.properties rename to org.argeo.security.dao.os/security.properties diff --git a/security/plugins/org.argeo.security.equinox/.classpath b/org.argeo.security.equinox/.classpath similarity index 100% rename from security/plugins/org.argeo.security.equinox/.classpath rename to org.argeo.security.equinox/.classpath diff --git a/security/plugins/org.argeo.security.equinox/.project b/org.argeo.security.equinox/.project similarity index 100% rename from security/plugins/org.argeo.security.equinox/.project rename to org.argeo.security.equinox/.project diff --git a/security/plugins/org.argeo.security.equinox/.settings/org.eclipse.pde.core.prefs b/org.argeo.security.equinox/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from security/plugins/org.argeo.security.equinox/.settings/org.eclipse.pde.core.prefs rename to org.argeo.security.equinox/.settings/org.eclipse.pde.core.prefs diff --git a/security/plugins/org.argeo.security.equinox/META-INF/spring/loginModules.xml b/org.argeo.security.equinox/META-INF/spring/loginModules.xml similarity index 100% rename from security/plugins/org.argeo.security.equinox/META-INF/spring/loginModules.xml rename to org.argeo.security.equinox/META-INF/spring/loginModules.xml diff --git a/security/plugins/org.argeo.security.equinox/META-INF/spring/osgi.xml b/org.argeo.security.equinox/META-INF/spring/osgi.xml similarity index 100% rename from security/plugins/org.argeo.security.equinox/META-INF/spring/osgi.xml rename to org.argeo.security.equinox/META-INF/spring/osgi.xml diff --git a/security/plugins/org.argeo.security.equinox/build.properties b/org.argeo.security.equinox/build.properties similarity index 100% rename from security/plugins/org.argeo.security.equinox/build.properties rename to org.argeo.security.equinox/build.properties diff --git a/security/plugins/org.argeo.security.equinox/plugin.xml b/org.argeo.security.equinox/plugin.xml similarity index 100% rename from security/plugins/org.argeo.security.equinox/plugin.xml rename to org.argeo.security.equinox/plugin.xml diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/org.argeo.security.equinox/pom.xml similarity index 75% rename from security/plugins/org.argeo.security.equinox/pom.xml rename to org.argeo.security.equinox/pom.xml index 4859c8d5a..834e1c4ef 100644 --- a/security/plugins/org.argeo.security.equinox/pom.xml +++ b/org.argeo.security.equinox/pom.xml @@ -1,9 +1,11 @@ - + + 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.security.equinox @@ -28,6 +30,7 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true *, org.springframework.core, org.argeo.eclipse.spring @@ -44,10 +47,10 @@ org.argeo.tp org.eclipse.osgi - + - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided @@ -55,12 +58,12 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT diff --git a/security/plugins/org.argeo.security.equinox/security.properties b/org.argeo.security.equinox/security.properties similarity index 100% rename from security/plugins/org.argeo.security.equinox/security.properties rename to org.argeo.security.equinox/security.properties diff --git a/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/OsSpringLoginModule.java b/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/OsSpringLoginModule.java similarity index 100% rename from security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/OsSpringLoginModule.java rename to org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/OsSpringLoginModule.java diff --git a/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java b/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java similarity index 100% rename from security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java rename to org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java diff --git a/security/plugins/org.argeo.security.ui.rap/.classpath b/org.argeo.security.jackrabbit/.classpath similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/.classpath rename to org.argeo.security.jackrabbit/.classpath diff --git a/security/runtime/org.argeo.security.jackrabbit/.project b/org.argeo.security.jackrabbit/.project similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/.project rename to org.argeo.security.jackrabbit/.project diff --git a/security/runtime/org.argeo.security.jackrabbit/build.properties b/org.argeo.security.jackrabbit/build.properties similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/build.properties rename to org.argeo.security.jackrabbit/build.properties diff --git a/security/runtime/org.argeo.security.jackrabbit/pom.xml b/org.argeo.security.jackrabbit/pom.xml similarity index 74% rename from security/runtime/org.argeo.security.jackrabbit/pom.xml rename to org.argeo.security.jackrabbit/pom.xml index 9b27c41dc..a18c453dd 100644 --- a/security/runtime/org.argeo.security.jackrabbit/pom.xml +++ b/org.argeo.security.jackrabbit/pom.xml @@ -1,8 +1,10 @@ - + + 4.0.0 - org.argeo.commons.security - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -30,7 +32,10 @@ org.apache.jackrabbit org.argeo.security.jackrabbit.* - *,org.springframework.core,org.argeo.jcr + + org.springframework.core, + org.argeo.jcr, + * @@ -38,7 +43,7 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java b/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java rename to org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoAccessManager.java diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java b/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java rename to org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoLoginModule.java diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java rename to org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java b/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java rename to org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSystemPrincipal.java diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java b/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java rename to org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java b/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java rename to org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/JackrabbitSecurityModel.java diff --git a/security/plugins/org.argeo.security.ui/.classpath b/org.argeo.security.ldap/.classpath similarity index 100% rename from security/plugins/org.argeo.security.ui/.classpath rename to org.argeo.security.ldap/.classpath diff --git a/security/runtime/org.argeo.security.ldap/.project b/org.argeo.security.ldap/.project similarity index 100% rename from security/runtime/org.argeo.security.ldap/.project rename to org.argeo.security.ldap/.project diff --git a/security/runtime/org.argeo.security.ldap/build.properties b/org.argeo.security.ldap/build.properties similarity index 100% rename from security/runtime/org.argeo.security.ldap/build.properties rename to org.argeo.security.ldap/build.properties diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/org.argeo.security.ldap/pom.xml similarity index 91% rename from security/runtime/org.argeo.security.ldap/pom.xml rename to org.argeo.security.ldap/pom.xml index 01f52a0aa..5b798b411 100644 --- a/security/runtime/org.argeo.security.ldap/pom.xml +++ b/org.argeo.security.ldap/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.security - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -44,12 +44,12 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java b/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java similarity index 100% rename from security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java rename to org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java b/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java similarity index 100% rename from security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java rename to org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java b/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java similarity index 100% rename from security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java rename to org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoUserAdminDaoLdap.java diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java b/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java similarity index 100% rename from security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java rename to org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java b/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java similarity index 100% rename from security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java rename to org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java diff --git a/security/runtime/org.argeo.security.mvc/.classpath b/org.argeo.security.mvc/.classpath similarity index 100% rename from security/runtime/org.argeo.security.mvc/.classpath rename to org.argeo.security.mvc/.classpath diff --git a/security/runtime/org.argeo.security.mvc/.project b/org.argeo.security.mvc/.project similarity index 100% rename from security/runtime/org.argeo.security.mvc/.project rename to org.argeo.security.mvc/.project diff --git a/security/runtime/org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs b/org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from security/runtime/org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.security.mvc/.settings/org.eclipse.jdt.core.prefs diff --git a/security/runtime/org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs b/org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from security/runtime/org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs rename to org.argeo.security.mvc/.settings/org.maven.ide.eclipse.prefs diff --git a/security/runtime/org.argeo.security.mvc/build.properties b/org.argeo.security.mvc/build.properties similarity index 100% rename from security/runtime/org.argeo.security.mvc/build.properties rename to org.argeo.security.mvc/build.properties diff --git a/security/runtime/org.argeo.security.mvc/pom.xml b/org.argeo.security.mvc/pom.xml similarity index 91% rename from security/runtime/org.argeo.security.mvc/pom.xml rename to org.argeo.security.mvc/pom.xml index e2a0c08d6..dcee8b322 100644 --- a/security/runtime/org.argeo.security.mvc/pom.xml +++ b/org.argeo.security.mvc/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.security - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -40,14 +40,14 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.core 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java b/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java similarity index 100% rename from security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java rename to org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoRememberMeServices.java diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java b/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java similarity index 100% rename from security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java rename to org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java similarity index 100% rename from security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java rename to org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java diff --git a/security/plugins/org.argeo.security.ui.admin/.classpath b/org.argeo.security.ui.admin/.classpath similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/.classpath rename to org.argeo.security.ui.admin/.classpath diff --git a/security/plugins/org.argeo.security.ui.admin/.project b/org.argeo.security.ui.admin/.project similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/.project rename to org.argeo.security.ui.admin/.project diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml b/org.argeo.security.ui.admin/META-INF/spring/commands.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml rename to org.argeo.security.ui.admin/META-INF/spring/commands.xml diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml b/org.argeo.security.ui.admin/META-INF/spring/common.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml rename to org.argeo.security.ui.admin/META-INF/spring/common.xml diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml b/org.argeo.security.ui.admin/META-INF/spring/editors.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml rename to org.argeo.security.ui.admin/META-INF/spring/editors.xml diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/osgi.xml b/org.argeo.security.ui.admin/META-INF/spring/osgi.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/META-INF/spring/osgi.xml rename to org.argeo.security.ui.admin/META-INF/spring/osgi.xml diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml b/org.argeo.security.ui.admin/META-INF/spring/views.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml rename to org.argeo.security.ui.admin/META-INF/spring/views.xml diff --git a/security/plugins/org.argeo.security.ui.admin/build.properties b/org.argeo.security.ui.admin/build.properties similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/build.properties rename to org.argeo.security.ui.admin/build.properties diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/add.gif b/org.argeo.security.ui.admin/icons/add.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/add.gif rename to org.argeo.security.ui.admin/icons/add.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/batch.gif b/org.argeo.security.ui.admin/icons/batch.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/batch.gif rename to org.argeo.security.ui.admin/icons/batch.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/clear.gif b/org.argeo.security.ui.admin/icons/clear.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/clear.gif rename to org.argeo.security.ui.admin/icons/clear.gif diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/refresh.png b/org.argeo.security.ui.admin/icons/refresh.png similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/refresh.png rename to org.argeo.security.ui.admin/icons/refresh.png diff --git a/server/plugins/org.argeo.jcr.ui.explorer/icons/remove.gif b/org.argeo.security.ui.admin/icons/remove.gif similarity index 100% rename from server/plugins/org.argeo.jcr.ui.explorer/icons/remove.gif rename to org.argeo.security.ui.admin/icons/remove.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/role.gif b/org.argeo.security.ui.admin/icons/role.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/role.gif rename to org.argeo.security.ui.admin/icons/role.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/save.gif b/org.argeo.security.ui.admin/icons/save.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/save.gif rename to org.argeo.security.ui.admin/icons/save.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/save_security.png b/org.argeo.security.ui.admin/icons/save_security.png similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/save_security.png rename to org.argeo.security.ui.admin/icons/save_security.png diff --git a/security/plugins/org.argeo.security.ui.admin/icons/save_security_disabled.png b/org.argeo.security.ui.admin/icons/save_security_disabled.png similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/save_security_disabled.png rename to org.argeo.security.ui.admin/icons/save_security_disabled.png diff --git a/security/plugins/org.argeo.security.ui.admin/icons/security.gif b/org.argeo.security.ui.admin/icons/security.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/security.gif rename to org.argeo.security.ui.admin/icons/security.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/sync.gif b/org.argeo.security.ui.admin/icons/sync.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/sync.gif rename to org.argeo.security.ui.admin/icons/sync.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/user.gif b/org.argeo.security.ui.admin/icons/user.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/user.gif rename to org.argeo.security.ui.admin/icons/user.gif diff --git a/security/plugins/org.argeo.security.ui.admin/icons/users.gif b/org.argeo.security.ui.admin/icons/users.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/icons/users.gif rename to org.argeo.security.ui.admin/icons/users.gif diff --git a/security/plugins/org.argeo.security.ui.admin/plugin.xml b/org.argeo.security.ui.admin/plugin.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/plugin.xml rename to org.argeo.security.ui.admin/plugin.xml diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/org.argeo.security.ui.admin/pom.xml similarity index 81% rename from security/plugins/org.argeo.security.ui.admin/pom.xml rename to org.argeo.security.ui.admin/pom.xml index 465ff88c7..9aeb51efd 100644 --- a/security/plugins/org.argeo.security.ui.admin/pom.xml +++ b/org.argeo.security.ui.admin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.security.ui.admin @@ -29,9 +30,9 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true lazy - org.argeo.security.ui.admin.SecurityAdminPlugin - + org.argeo.security.ui.admin.SecurityAdminPlugin org.eclipse.core.runtime *, @@ -51,39 +52,39 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.jcr 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.rcp 2.1.12-SNAPSHOT provided @@ -91,7 +92,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui.admin/security-admin.properties b/org.argeo.security.ui.admin/security-admin.properties similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/security-admin.properties rename to org.argeo.security.ui.admin/security-admin.properties diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminImages.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminImages.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminImages.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminImages.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/UserTableComposite.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/UserTableComposite.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/UserTableComposite.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/UserTableComposite.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteRole.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteRole.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteRole.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteRole.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteUser.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteUser.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteUser.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/DeleteUser.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshRoles.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshRoles.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshRoles.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshRoles.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/UserBatchUpdate.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/UserBatchUpdate.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/UserBatchUpdate.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/UserBatchUpdate.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/UserRolesPage.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/UserRolesPage.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/UserRolesPage.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/UserRolesPage.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java b/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java similarity index 100% rename from security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java rename to org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java diff --git a/security/runtime/org.argeo.security.jackrabbit/.classpath b/org.argeo.security.ui.rap/.classpath similarity index 100% rename from security/runtime/org.argeo.security.jackrabbit/.classpath rename to org.argeo.security.ui.rap/.classpath diff --git a/security/plugins/org.argeo.security.ui.rap/.project b/org.argeo.security.ui.rap/.project similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/.project rename to org.argeo.security.ui.rap/.project diff --git a/security/plugins/org.argeo.security.ui.rap/META-INF/jaas_default.txt b/org.argeo.security.ui.rap/META-INF/jaas_default.txt similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/META-INF/jaas_default.txt rename to org.argeo.security.ui.rap/META-INF/jaas_default.txt diff --git a/security/plugins/org.argeo.security.ui.rap/META-INF/spring/commands.xml b/org.argeo.security.ui.rap/META-INF/spring/commands.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/META-INF/spring/commands.xml rename to org.argeo.security.ui.rap/META-INF/spring/commands.xml diff --git a/security/plugins/org.argeo.security.ui.rap/META-INF/spring/osgi.xml b/org.argeo.security.ui.rap/META-INF/spring/osgi.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/META-INF/spring/osgi.xml rename to org.argeo.security.ui.rap/META-INF/spring/osgi.xml diff --git a/security/plugins/org.argeo.security.ui.rap/branding/afterLogout.html b/org.argeo.security.ui.rap/branding/afterLogout.html similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/branding/afterLogout.html rename to org.argeo.security.ui.rap/branding/afterLogout.html diff --git a/security/plugins/org.argeo.security.ui.rap/branding/empty.html b/org.argeo.security.ui.rap/branding/empty.html similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/branding/empty.html rename to org.argeo.security.ui.rap/branding/empty.html diff --git a/security/plugins/org.argeo.security.ui.rap/branding/favicon.ico b/org.argeo.security.ui.rap/branding/favicon.ico similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/branding/favicon.ico rename to org.argeo.security.ui.rap/branding/favicon.ico diff --git a/security/plugins/org.argeo.security.ui.rap/branding/login.html b/org.argeo.security.ui.rap/branding/login.html similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/branding/login.html rename to org.argeo.security.ui.rap/branding/login.html diff --git a/security/plugins/org.argeo.security.ui.rap/branding/public.html b/org.argeo.security.ui.rap/branding/public.html similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/branding/public.html rename to org.argeo.security.ui.rap/branding/public.html diff --git a/security/plugins/org.argeo.security.ui.rap/build.properties b/org.argeo.security.ui.rap/build.properties similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/build.properties rename to org.argeo.security.ui.rap/build.properties diff --git a/security/plugins/org.argeo.security.ui.rap/icons/closeAll.gif b/org.argeo.security.ui.rap/icons/closeAll.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/icons/closeAll.gif rename to org.argeo.security.ui.rap/icons/closeAll.gif diff --git a/security/plugins/org.argeo.security.ui.rap/icons/exit.png b/org.argeo.security.ui.rap/icons/exit.png similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/icons/exit.png rename to org.argeo.security.ui.rap/icons/exit.png diff --git a/security/plugins/org.argeo.security.ui.rap/icons/home.gif b/org.argeo.security.ui.rap/icons/home.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/icons/home.gif rename to org.argeo.security.ui.rap/icons/home.gif diff --git a/security/plugins/org.argeo.security.ui.rap/icons/main.gif b/org.argeo.security.ui.rap/icons/main.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/icons/main.gif rename to org.argeo.security.ui.rap/icons/main.gif diff --git a/security/plugins/org.argeo.security.ui.rap/icons/password.gif b/org.argeo.security.ui.rap/icons/password.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/icons/password.gif rename to org.argeo.security.ui.rap/icons/password.gif diff --git a/security/plugins/org.argeo.security.ui.rap/icons/preferences.png b/org.argeo.security.ui.rap/icons/preferences.png similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/icons/preferences.png rename to org.argeo.security.ui.rap/icons/preferences.png diff --git a/security/plugins/org.argeo.security.ui.rap/plugin.xml b/org.argeo.security.ui.rap/plugin.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/plugin.xml rename to org.argeo.security.ui.rap/plugin.xml diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/org.argeo.security.ui.rap/pom.xml similarity index 72% rename from security/plugins/org.argeo.security.ui.rap/pom.xml rename to org.argeo.security.ui.rap/pom.xml index 200f373e1..6dd6dceb1 100644 --- a/security/plugins/org.argeo.security.ui.rap/pom.xml +++ b/org.argeo.security.ui.rap/pom.xml @@ -1,9 +1,11 @@ - + + 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.security.ui.rap @@ -28,14 +30,15 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true org.argeo.security.ui.rap.SecureRapActivator lazy org.eclipse.rap.ui,org.eclipse.core.runtime - org.springframework.core, - org.argeo.eclipse.spring, - org.argeo.eclipse.ui.specific, - * + org.springframework.core, + org.argeo.eclipse.spring, + org.argeo.eclipse.ui.specific, + * @@ -45,7 +48,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT @@ -58,24 +61,24 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.equinox 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rap 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.rap 2.1.12-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapActionBarAdvisor.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapActionBarAdvisor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapActionBarAdvisor.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapActionBarAdvisor.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWindowAdvisor.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWindowAdvisor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWindowAdvisor.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWindowAdvisor.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/commands/UserMenu.java b/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/commands/UserMenu.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/commands/UserMenu.java rename to org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/commands/UserMenu.java diff --git a/security/plugins/org.argeo.security.ui.rcp/.classpath b/org.argeo.security.ui.rcp/.classpath similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/.classpath rename to org.argeo.security.ui.rcp/.classpath diff --git a/security/plugins/org.argeo.security.ui.rcp/.project b/org.argeo.security.ui.rcp/.project similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/.project rename to org.argeo.security.ui.rcp/.project diff --git a/security/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs b/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs diff --git a/security/plugins/org.argeo.security.ui.rcp/META-INF/jaas_default.txt b/org.argeo.security.ui.rcp/META-INF/jaas_default.txt similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/META-INF/jaas_default.txt rename to org.argeo.security.ui.rcp/META-INF/jaas_default.txt diff --git a/security/plugins/org.argeo.security.ui.rcp/build.properties b/org.argeo.security.ui.rcp/build.properties similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/build.properties rename to org.argeo.security.ui.rcp/build.properties diff --git a/security/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif b/org.argeo.security.ui.rcp/icons/alt_about.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif rename to org.argeo.security.ui.rcp/icons/alt_about.gif diff --git a/security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns b/org.argeo.security.ui.rcp/icons/alt_launcher.icns similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns rename to org.argeo.security.ui.rcp/icons/alt_launcher.icns diff --git a/security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico b/org.argeo.security.ui.rcp/icons/alt_launcher.ico similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico rename to org.argeo.security.ui.rcp/icons/alt_launcher.ico diff --git a/security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm b/org.argeo.security.ui.rcp/icons/alt_launcher.xpm similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm rename to org.argeo.security.ui.rcp/icons/alt_launcher.xpm diff --git a/security/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif b/org.argeo.security.ui.rcp/icons/alt_window_16.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif rename to org.argeo.security.ui.rcp/icons/alt_window_16.gif diff --git a/security/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif b/org.argeo.security.ui.rcp/icons/alt_window_32.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif rename to org.argeo.security.ui.rcp/icons/alt_window_32.gif diff --git a/security/plugins/org.argeo.security.ui.rcp/plugin.xml b/org.argeo.security.ui.rcp/plugin.xml similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/plugin.xml rename to org.argeo.security.ui.rcp/plugin.xml diff --git a/security/plugins/org.argeo.security.ui.rcp/plugin_customization.ini b/org.argeo.security.ui.rcp/plugin_customization.ini similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/plugin_customization.ini rename to org.argeo.security.ui.rcp/plugin_customization.ini diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/org.argeo.security.ui.rcp/pom.xml similarity index 80% rename from security/plugins/org.argeo.security.ui.rcp/pom.xml rename to org.argeo.security.ui.rcp/pom.xml index 98daf7dba..22cc11400 100644 --- a/security/plugins/org.argeo.security.ui.rcp/pom.xml +++ b/org.argeo.security.ui.rcp/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.security.ui.rcp @@ -29,6 +30,7 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true org.argeo.security.ui.rcp.SecureApplicationActivator lazy org.eclipse.ui,org.eclipse.core.runtime @@ -45,7 +47,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT @@ -58,24 +60,24 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.ui 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.equinox 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui.rcp 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java b/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java rename to org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java b/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java rename to org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java b/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java rename to org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java b/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java rename to org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java b/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java rename to org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java b/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java similarity index 100% rename from security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java rename to org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java diff --git a/security/runtime/org.argeo.security.ldap/.classpath b/org.argeo.security.ui/.classpath similarity index 100% rename from security/runtime/org.argeo.security.ldap/.classpath rename to org.argeo.security.ui/.classpath diff --git a/security/plugins/org.argeo.security.ui/.project b/org.argeo.security.ui/.project similarity index 100% rename from security/plugins/org.argeo.security.ui/.project rename to org.argeo.security.ui/.project diff --git a/security/plugins/org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs b/org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from security/plugins/org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs rename to org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/commands.xml b/org.argeo.security.ui/META-INF/spring/commands.xml similarity index 100% rename from security/plugins/org.argeo.security.ui/META-INF/spring/commands.xml rename to org.argeo.security.ui/META-INF/spring/commands.xml diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/keyring.xml b/org.argeo.security.ui/META-INF/spring/keyring.xml similarity index 100% rename from security/plugins/org.argeo.security.ui/META-INF/spring/keyring.xml rename to org.argeo.security.ui/META-INF/spring/keyring.xml diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml b/org.argeo.security.ui/META-INF/spring/osgi.xml similarity index 100% rename from security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml rename to org.argeo.security.ui/META-INF/spring/osgi.xml diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/views.xml b/org.argeo.security.ui/META-INF/spring/views.xml similarity index 100% rename from security/plugins/org.argeo.security.ui/META-INF/spring/views.xml rename to org.argeo.security.ui/META-INF/spring/views.xml diff --git a/security/plugins/org.argeo.security.ui/build.properties b/org.argeo.security.ui/build.properties similarity index 100% rename from security/plugins/org.argeo.security.ui/build.properties rename to org.argeo.security.ui/build.properties diff --git a/security/plugins/org.argeo.security.ui/icons/adminLog.gif b/org.argeo.security.ui/icons/adminLog.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/adminLog.gif rename to org.argeo.security.ui/icons/adminLog.gif diff --git a/security/plugins/org.argeo.security.ui/icons/home.gif b/org.argeo.security.ui/icons/home.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/home.gif rename to org.argeo.security.ui/icons/home.gif diff --git a/security/plugins/org.argeo.security.ui/icons/log.gif b/org.argeo.security.ui/icons/log.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/log.gif rename to org.argeo.security.ui/icons/log.gif diff --git a/security/plugins/org.argeo.security.ui/icons/maintenance.gif b/org.argeo.security.ui/icons/maintenance.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/maintenance.gif rename to org.argeo.security.ui/icons/maintenance.gif diff --git a/security/plugins/org.argeo.security.ui/icons/password.gif b/org.argeo.security.ui/icons/password.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/password.gif rename to org.argeo.security.ui/icons/password.gif diff --git a/security/plugins/org.argeo.security.ui/icons/user.gif b/org.argeo.security.ui/icons/user.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/user.gif rename to org.argeo.security.ui/icons/user.gif diff --git a/security/plugins/org.argeo.security.ui/plugin.xml b/org.argeo.security.ui/plugin.xml similarity index 100% rename from security/plugins/org.argeo.security.ui/plugin.xml rename to org.argeo.security.ui/plugin.xml diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml similarity index 79% rename from security/plugins/org.argeo.security.ui/pom.xml rename to org.argeo.security.ui/pom.xml index a03cb84f5..bd909d84b 100644 --- a/security/plugins/org.argeo.security.ui/pom.xml +++ b/org.argeo.security.ui/pom.xml @@ -1,9 +1,11 @@ - + + 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - plugins + argeo-commons .. org.argeo.security.ui @@ -28,6 +30,7 @@ maven-bundle-plugin + ${project.artifactId};singleton:=true lazy org.argeo.security.ui.SecurityUiPlugin org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime @@ -48,21 +51,21 @@ - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.ui 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.eclipse.dep.rcp 2.1.12-SNAPSHOT provided @@ -70,7 +73,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui/securityui.properties b/org.argeo.security.ui/securityui.properties similarity index 100% rename from security/plugins/org.argeo.security.ui/securityui.properties rename to org.argeo.security.ui/securityui.properties diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/MaintenancePerspective.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/MaintenancePerspective.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/MaintenancePerspective.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/MaintenancePerspective.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/PrivilegedJob.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/PrivilegedJob.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/PrivilegedJob.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/PrivilegedJob.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/RolesSourceProvider.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/RolesSourceProvider.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/RolesSourceProvider.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/RolesSourceProvider.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/UserHomePerspective.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/UserHomePerspective.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/UserHomePerspective.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/UserHomePerspective.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenHomePerspective.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenHomePerspective.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenHomePerspective.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenHomePerspective.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogView.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogView.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogView.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogView.java diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UserProfile.java b/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UserProfile.java similarity index 100% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UserProfile.java rename to org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UserProfile.java diff --git a/server/modules/org.argeo.server.ads.server/.project b/org.argeo.server.ads.server/.project similarity index 100% rename from server/modules/org.argeo.server.ads.server/.project rename to org.argeo.server.ads.server/.project diff --git a/server/modules/org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs b/org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from server/modules/org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs rename to org.argeo.server.ads.server/.settings/org.eclipse.pde.core.prefs diff --git a/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml b/org.argeo.server.ads.server/META-INF/spring/ads.xml similarity index 100% rename from server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml rename to org.argeo.server.ads.server/META-INF/spring/ads.xml diff --git a/server/modules/org.argeo.server.ads.server/META-INF/spring/server.xml b/org.argeo.server.ads.server/META-INF/spring/server.xml similarity index 100% rename from server/modules/org.argeo.server.ads.server/META-INF/spring/server.xml rename to org.argeo.server.ads.server/META-INF/spring/server.xml diff --git a/server/modules/org.argeo.server.ads.server/ads.properties b/org.argeo.server.ads.server/ads.properties similarity index 100% rename from server/modules/org.argeo.server.ads.server/ads.properties rename to org.argeo.server.ads.server/ads.properties diff --git a/server/modules/org.argeo.server.ads.server/build.properties b/org.argeo.server.ads.server/build.properties similarity index 100% rename from server/modules/org.argeo.server.ads.server/build.properties rename to org.argeo.server.ads.server/build.properties diff --git a/server/modules/org.argeo.server.ads.server/init.ldif b/org.argeo.server.ads.server/init.ldif similarity index 100% rename from server/modules/org.argeo.server.ads.server/init.ldif rename to org.argeo.server.ads.server/init.ldif diff --git a/server/modules/org.argeo.server.ads.server/pom.xml b/org.argeo.server.ads.server/pom.xml similarity index 95% rename from server/modules/org.argeo.server.ads.server/pom.xml rename to org.argeo.server.ads.server/pom.xml index 0217736b4..4e6c53721 100644 --- a/server/modules/org.argeo.server.ads.server/pom.xml +++ b/org.argeo.server.ads.server/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.server.ads.server diff --git a/server/runtime/org.argeo.server.ads/.classpath b/org.argeo.server.ads/.classpath similarity index 100% rename from server/runtime/org.argeo.server.ads/.classpath rename to org.argeo.server.ads/.classpath diff --git a/server/runtime/org.argeo.server.ads/.project b/org.argeo.server.ads/.project similarity index 100% rename from server/runtime/org.argeo.server.ads/.project rename to org.argeo.server.ads/.project diff --git a/server/runtime/org.argeo.server.ads/.settings/org.eclipse.jdt.core.prefs b/org.argeo.server.ads/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from server/runtime/org.argeo.server.ads/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.server.ads/.settings/org.eclipse.jdt.core.prefs diff --git a/server/runtime/org.argeo.server.ads/.settings/org.maven.ide.eclipse.prefs b/org.argeo.server.ads/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from server/runtime/org.argeo.server.ads/.settings/org.maven.ide.eclipse.prefs rename to org.argeo.server.ads/.settings/org.maven.ide.eclipse.prefs diff --git a/server/runtime/org.argeo.server.ads/build.properties b/org.argeo.server.ads/build.properties similarity index 100% rename from server/runtime/org.argeo.server.ads/build.properties rename to org.argeo.server.ads/build.properties diff --git a/server/runtime/org.argeo.server.ads/pom.xml b/org.argeo.server.ads/pom.xml similarity index 94% rename from server/runtime/org.argeo.server.ads/pom.xml rename to org.argeo.server.ads/pom.xml index 76a4a1319..51e2a3d83 100644 --- a/server/runtime/org.argeo.server.ads/pom.xml +++ b/org.argeo.server.ads/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -38,7 +38,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/server/runtime/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java b/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java similarity index 100% rename from server/runtime/org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java rename to org.argeo.server.ads/src/main/java/org/argeo/server/ads/AdsContainer.java diff --git a/base/runtime/org.argeo.support.junit/.classpath b/org.argeo.server.core/.classpath similarity index 100% rename from base/runtime/org.argeo.support.junit/.classpath rename to org.argeo.server.core/.classpath diff --git a/server/runtime/org.argeo.server.core/.project b/org.argeo.server.core/.project similarity index 100% rename from server/runtime/org.argeo.server.core/.project rename to org.argeo.server.core/.project diff --git a/server/runtime/org.argeo.server.core/build.properties b/org.argeo.server.core/build.properties similarity index 100% rename from server/runtime/org.argeo.server.core/build.properties rename to org.argeo.server.core/build.properties diff --git a/server/runtime/org.argeo.server.core/pom.xml b/org.argeo.server.core/pom.xml similarity index 95% rename from server/runtime/org.argeo.server.core/pom.xml rename to org.argeo.server.core/pom.xml index 0a5634eb0..f8a23d5a2 100644 --- a/server/runtime/org.argeo.server.core/pom.xml +++ b/org.argeo.server.core/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -44,7 +44,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/BooleanAnswer.java b/org.argeo.server.core/src/main/java/org/argeo/server/BooleanAnswer.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/BooleanAnswer.java rename to org.argeo.server.core/src/main/java/org/argeo/server/BooleanAnswer.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/Deserializer.java b/org.argeo.server.core/src/main/java/org/argeo/server/Deserializer.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/Deserializer.java rename to org.argeo.server.core/src/main/java/org/argeo/server/Deserializer.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/DeserializingEditor.java b/org.argeo.server.core/src/main/java/org/argeo/server/DeserializingEditor.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/DeserializingEditor.java rename to org.argeo.server.core/src/main/java/org/argeo/server/DeserializingEditor.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/PrimitiveAnswer.java b/org.argeo.server.core/src/main/java/org/argeo/server/PrimitiveAnswer.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/PrimitiveAnswer.java rename to org.argeo.server.core/src/main/java/org/argeo/server/PrimitiveAnswer.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/Serializer.java b/org.argeo.server.core/src/main/java/org/argeo/server/Serializer.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/Serializer.java rename to org.argeo.server.core/src/main/java/org/argeo/server/Serializer.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerAnswer.java b/org.argeo.server.core/src/main/java/org/argeo/server/ServerAnswer.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerAnswer.java rename to org.argeo.server.core/src/main/java/org/argeo/server/ServerAnswer.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerSerializer.java b/org.argeo.server.core/src/main/java/org/argeo/server/ServerSerializer.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerSerializer.java rename to org.argeo.server.core/src/main/java/org/argeo/server/ServerSerializer.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/AtomicBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/AtomicBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/AtomicBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/AtomicBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupContext.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupContext.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupContext.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupContext.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupPurge.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupPurge.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupPurge.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupPurge.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupUtils.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupUtils.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupUtils.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupUtils.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/MySqlBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/MySqlBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/MySqlBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/MySqlBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/OpenLdapBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/OpenLdapBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/OpenLdapBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/OpenLdapBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/OsCallBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/OsCallBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/OsCallBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/OsCallBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupContext.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupContext.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupContext.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupContext.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SvnBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/SvnBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SvnBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/SvnBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java b/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java rename to org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java b/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java rename to org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java b/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java rename to org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoAware.java b/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoAware.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoAware.java rename to org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoAware.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java b/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java rename to org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoSupport.java b/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoSupport.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoSupport.java rename to org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoSupport.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java b/org.argeo.server.core/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java rename to org.argeo.server.core/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/EmptyViewController.java b/org.argeo.server.core/src/main/java/org/argeo/server/mvc/EmptyViewController.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/EmptyViewController.java rename to org.argeo.server.core/src/main/java/org/argeo/server/mvc/EmptyViewController.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/MvcConstants.java b/org.argeo.server.core/src/main/java/org/argeo/server/mvc/MvcConstants.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/MvcConstants.java rename to org.argeo.server.core/src/main/java/org/argeo/server/mvc/MvcConstants.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java b/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java rename to org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java b/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java similarity index 100% rename from server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java rename to org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java diff --git a/server/runtime/org.argeo.server.jackrabbit/.classpath b/org.argeo.server.jackrabbit/.classpath similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/.classpath rename to org.argeo.server.jackrabbit/.classpath diff --git a/server/runtime/org.argeo.server.jackrabbit/.project b/org.argeo.server.jackrabbit/.project similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/.project rename to org.argeo.server.jackrabbit/.project diff --git a/server/runtime/org.argeo.server.jackrabbit/build.properties b/org.argeo.server.jackrabbit/build.properties similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/build.properties rename to org.argeo.server.jackrabbit/build.properties diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/org.argeo.server.jackrabbit/pom.xml similarity index 80% rename from server/runtime/org.argeo.server.jackrabbit/pom.xml rename to org.argeo.server.jackrabbit/pom.xml index 9f2f585af..41f2a4b82 100644 --- a/server/runtime/org.argeo.server.jackrabbit/pom.xml +++ b/org.argeo.server.jackrabbit/pom.xml @@ -1,8 +1,10 @@ - + + 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -34,6 +36,7 @@ javax.servlet, org.apache.jackrabbit.webdav.server, org.springframework.web.context, + org.osgi.framework;version="0.0.0", org.xml.sax;version="0.0.0", org.apache.jackrabbit.webdav.jcr, org.springframework.beans, @@ -46,19 +49,19 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.server + org.argeo.commons org.argeo.server.jcr.mvc 2.1.12-SNAPSHOT - org.argeo.commons.base + org.argeo.commons org.argeo.dep.jackrabbit pom 2.1.12-SNAPSHOT @@ -87,13 +90,13 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.support.junit 2.1.12-SNAPSHOT test - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitDataModelMigration.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitDataModelMigration.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitDataModelMigration.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitDataModelMigration.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOHandlerWrapper.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOHandlerWrapper.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOHandlerWrapper.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOHandlerWrapper.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOManagerBean.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOManagerBean.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOManagerBean.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/IOManagerBean.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ScopedSessionProvider.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ScopedSessionProvider.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ScopedSessionProvider.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ScopedSessionProvider.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java b/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java rename to org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml b/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml rename to org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-fs.xml diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml b/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml rename to org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-h2.xml diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml b/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml rename to org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-memory.xml diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/wikitext/design.mediawiki b/org.argeo.server.jackrabbit/src/main/wikitext/design.mediawiki similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/wikitext/design.mediawiki rename to org.argeo.server.jackrabbit/src/main/wikitext/design.mediawiki diff --git a/server/runtime/org.argeo.server.jcr.mvc/.classpath b/org.argeo.server.jcr.mvc/.classpath similarity index 100% rename from server/runtime/org.argeo.server.jcr.mvc/.classpath rename to org.argeo.server.jcr.mvc/.classpath diff --git a/server/runtime/org.argeo.server.jcr.mvc/.project b/org.argeo.server.jcr.mvc/.project similarity index 100% rename from server/runtime/org.argeo.server.jcr.mvc/.project rename to org.argeo.server.jcr.mvc/.project diff --git a/server/runtime/org.argeo.server.jcr.mvc/build.properties b/org.argeo.server.jcr.mvc/build.properties similarity index 100% rename from server/runtime/org.argeo.server.jcr.mvc/build.properties rename to org.argeo.server.jcr.mvc/build.properties diff --git a/server/runtime/org.argeo.server.jcr.mvc/pom.xml b/org.argeo.server.jcr.mvc/pom.xml similarity index 94% rename from server/runtime/org.argeo.server.jcr.mvc/pom.xml rename to org.argeo.server.jcr.mvc/pom.xml index b25208770..9bc4a42ec 100644 --- a/server/runtime/org.argeo.server.jcr.mvc/pom.xml +++ b/org.argeo.server.jcr.mvc/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -48,7 +48,7 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.jcr 2.1.12-SNAPSHOT diff --git a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java b/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java similarity index 100% rename from server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java rename to org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java diff --git a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java b/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java similarity index 100% rename from server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java rename to org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java diff --git a/server/runtime/org.argeo.server.jcr/.classpath b/org.argeo.server.jcr/.classpath similarity index 100% rename from server/runtime/org.argeo.server.jcr/.classpath rename to org.argeo.server.jcr/.classpath diff --git a/server/runtime/org.argeo.server.jcr/.project b/org.argeo.server.jcr/.project similarity index 100% rename from server/runtime/org.argeo.server.jcr/.project rename to org.argeo.server.jcr/.project diff --git a/server/runtime/org.argeo.server.jcr/build.properties b/org.argeo.server.jcr/build.properties similarity index 100% rename from server/runtime/org.argeo.server.jcr/build.properties rename to org.argeo.server.jcr/build.properties diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/org.argeo.server.jcr/pom.xml similarity index 91% rename from server/runtime/org.argeo.server.jcr/pom.xml rename to org.argeo.server.jcr/pom.xml index dd6742467..4d8c2ea38 100644 --- a/server/runtime/org.argeo.server.jcr/pom.xml +++ b/org.argeo.server.jcr/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -58,7 +58,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT @@ -107,27 +107,27 @@ true - org.argeo.commons.base + org.argeo.commons org.argeo.dep.jackrabbit 2.1.12-SNAPSHOT pom test - org.argeo.commons.base + org.argeo.commons org.argeo.support.junit 2.1.12-SNAPSHOT test - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom test - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoTypes.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoTypes.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoTypes.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoTypes.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/CollectionNodeIterator.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/CollectionNodeIterator.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/CollectionNodeIterator.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/CollectionNodeIterator.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultJcrListener.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultJcrListener.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultJcrListener.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultJcrListener.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryFactory.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryFactory.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryFactory.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryFactory.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrCallback.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrCallback.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrCallback.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrCallback.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrRepositoryWrapper.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrRepositoryWrapper.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrRepositoryWrapper.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrRepositoryWrapper.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUrlStreamHandler.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUrlStreamHandler.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUrlStreamHandler.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUrlStreamHandler.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/MaintainedRepository.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/MaintainedRepository.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/MaintainedRepository.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/MaintainedRepository.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapper.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapper.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapper.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapper.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapperProvider.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapperProvider.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapperProvider.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/NodeMapperProvider.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/PropertyDiff.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/PropertyDiff.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/PropertyDiff.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/PropertyDiff.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/RepositoryRegister.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/RepositoryRegister.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/RepositoryRegister.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/RepositoryRegister.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/UserJcrUtils.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/UserJcrUtils.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/UserJcrUtils.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/UserJcrUtils.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/AbstractUrlProxy.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/BeanNodeMapper.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/BeanNodeMapper.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/BeanNodeMapper.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/BeanNodeMapper.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/ThreadBoundSession.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/ThreadBoundSession.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/ThreadBoundSession.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/spring/ThreadBoundSession.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java b/org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java rename to org.argeo.server.jcr/src/main/java/org/argeo/jcr/unit/AbstractJcrTestCase.java diff --git a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd b/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd rename to org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java b/org.argeo.server.jcr/src/test/java/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java rename to org.argeo.server.jcr/src/test/java/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/CollectionsObject.java b/org.argeo.server.jcr/src/test/java/org/argeo/jcr/CollectionsObject.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/CollectionsObject.java rename to org.argeo.server.jcr/src/test/java/org/argeo/jcr/CollectionsObject.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java b/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java rename to org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/OtherObject.java b/org.argeo.server.jcr/src/test/java/org/argeo/jcr/OtherObject.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/OtherObject.java rename to org.argeo.server.jcr/src/test/java/org/argeo/jcr/OtherObject.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/SimpleObject.java b/org.argeo.server.jcr/src/test/java/org/argeo/jcr/SimpleObject.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/SimpleObject.java rename to org.argeo.server.jcr/src/test/java/org/argeo/jcr/SimpleObject.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java b/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java rename to org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java b/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java rename to org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/log4j.properties b/org.argeo.server.jcr/src/test/resources/log4j.properties similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/log4j.properties rename to org.argeo.server.jcr/src/test/resources/log4j.properties diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy00.xls b/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy00.xls similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy00.xls rename to org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy00.xls diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy01.xls b/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy01.xls similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy01.xls rename to org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy01.xls diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy02.xls b/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy02.xls similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy02.xls rename to org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy02.xls diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy03.xls b/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy03.xls similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy03.xls rename to org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/dummy03.xls diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-h2.xml b/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-h2.xml similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-h2.xml rename to org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-h2.xml diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-memory.xml b/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-memory.xml similarity index 100% rename from server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-memory.xml rename to org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-memory.xml diff --git a/server/modules/org.argeo.server.rap.webapp/.project b/org.argeo.server.rap.webapp/.project similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/.project rename to org.argeo.server.rap.webapp/.project diff --git a/server/modules/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs b/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs rename to org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs diff --git a/server/modules/org.argeo.server.rap.webapp/META-INF/context-template.xml b/org.argeo.server.rap.webapp/META-INF/context-template.xml similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/META-INF/context-template.xml rename to org.argeo.server.rap.webapp/META-INF/context-template.xml diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml b/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml rename to org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/osgi.xml b/org.argeo.server.rap.webapp/WEB-INF/osgi.xml similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/WEB-INF/osgi.xml rename to org.argeo.server.rap.webapp/WEB-INF/osgi.xml diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml b/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml rename to org.argeo.server.rap.webapp/WEB-INF/security-filters.xml diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml b/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml rename to org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml b/org.argeo.server.rap.webapp/WEB-INF/web.xml similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml rename to org.argeo.server.rap.webapp/WEB-INF/web.xml diff --git a/server/modules/org.argeo.server.rap.webapp/build.properties b/org.argeo.server.rap.webapp/build.properties similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/build.properties rename to org.argeo.server.rap.webapp/build.properties diff --git a/server/modules/org.argeo.server.rap.webapp/pom.xml b/org.argeo.server.rap.webapp/pom.xml similarity index 95% rename from server/modules/org.argeo.server.rap.webapp/pom.xml rename to org.argeo.server.rap.webapp/pom.xml index 365166b26..abf636f5e 100644 --- a/server/modules/org.argeo.server.rap.webapp/pom.xml +++ b/org.argeo.server.rap.webapp/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.server.rap.webapp diff --git a/server/modules/org.argeo.server.rap.webapp/rap-webapp.properties b/org.argeo.server.rap.webapp/rap-webapp.properties similarity index 100% rename from server/modules/org.argeo.server.rap.webapp/rap-webapp.properties rename to org.argeo.server.rap.webapp/rap-webapp.properties diff --git a/server/runtime/org.argeo.server.core/.classpath b/org.argeo.support.junit/.classpath similarity index 100% rename from server/runtime/org.argeo.server.core/.classpath rename to org.argeo.support.junit/.classpath diff --git a/base/runtime/org.argeo.support.junit/.project b/org.argeo.support.junit/.project similarity index 100% rename from base/runtime/org.argeo.support.junit/.project rename to org.argeo.support.junit/.project diff --git a/base/runtime/org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs b/org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from base/runtime/org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs diff --git a/base/runtime/org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs b/org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from base/runtime/org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs rename to org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs diff --git a/base/runtime/org.argeo.support.junit/pom.xml b/org.argeo.support.junit/pom.xml similarity index 95% rename from base/runtime/org.argeo.support.junit/pom.xml rename to org.argeo.support.junit/pom.xml index ddc917442..e836ca52c 100644 --- a/base/runtime/org.argeo.support.junit/pom.xml +++ b/org.argeo.support.junit/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.base - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. diff --git a/base/runtime/org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java b/org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java similarity index 100% rename from base/runtime/org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java rename to org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java diff --git a/base/runtime/org.argeo.util/.classpath b/org.argeo.util/.classpath similarity index 100% rename from base/runtime/org.argeo.util/.classpath rename to org.argeo.util/.classpath diff --git a/base/runtime/org.argeo.util/.project b/org.argeo.util/.project similarity index 100% rename from base/runtime/org.argeo.util/.project rename to org.argeo.util/.project diff --git a/base/runtime/org.argeo.util/build.properties b/org.argeo.util/build.properties similarity index 100% rename from base/runtime/org.argeo.util/build.properties rename to org.argeo.util/build.properties diff --git a/base/runtime/org.argeo.util/pom.xml b/org.argeo.util/pom.xml similarity index 91% rename from base/runtime/org.argeo.util/pom.xml rename to org.argeo.util/pom.xml index b05152585..9077e7fc5 100644 --- a/base/runtime/org.argeo.util/pom.xml +++ b/org.argeo.util/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.base - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoException.java b/org.argeo.util/src/main/java/org/argeo/ArgeoException.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoException.java rename to org.argeo.util/src/main/java/org/argeo/ArgeoException.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoLogListener.java b/org.argeo.util/src/main/java/org/argeo/ArgeoLogListener.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoLogListener.java rename to org.argeo.util/src/main/java/org/argeo/ArgeoLogListener.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoLogger.java b/org.argeo.util/src/main/java/org/argeo/ArgeoLogger.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoLogger.java rename to org.argeo.util/src/main/java/org/argeo/ArgeoLogger.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoMonitor.java b/org.argeo.util/src/main/java/org/argeo/ArgeoMonitor.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/ArgeoMonitor.java rename to org.argeo.util/src/main/java/org/argeo/ArgeoMonitor.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/OperatingSystem.java b/org.argeo.util/src/main/java/org/argeo/OperatingSystem.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/OperatingSystem.java rename to org.argeo.util/src/main/java/org/argeo/OperatingSystem.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/StreamUtils.java b/org.argeo.util/src/main/java/org/argeo/StreamUtils.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/StreamUtils.java rename to org.argeo.util/src/main/java/org/argeo/StreamUtils.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/CsvParser.java b/org.argeo.util/src/main/java/org/argeo/util/CsvParser.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/CsvParser.java rename to org.argeo.util/src/main/java/org/argeo/util/CsvParser.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java b/org.argeo.util/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java rename to org.argeo.util/src/main/java/org/argeo/util/CsvParserWithLinesAsMap.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/CsvWriter.java b/org.argeo.util/src/main/java/org/argeo/util/CsvWriter.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/CsvWriter.java rename to org.argeo.util/src/main/java/org/argeo/util/CsvWriter.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/LocaleCallback.java b/org.argeo.util/src/main/java/org/argeo/util/LocaleCallback.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/LocaleCallback.java rename to org.argeo.util/src/main/java/org/argeo/util/LocaleCallback.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/LocaleUtils.java b/org.argeo.util/src/main/java/org/argeo/util/LocaleUtils.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/LocaleUtils.java rename to org.argeo.util/src/main/java/org/argeo/util/LocaleUtils.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/Throughput.java b/org.argeo.util/src/main/java/org/argeo/util/Throughput.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/Throughput.java rename to org.argeo.util/src/main/java/org/argeo/util/Throughput.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/ThroughputEditor.java b/org.argeo.util/src/main/java/org/argeo/util/ThroughputEditor.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/ThroughputEditor.java rename to org.argeo.util/src/main/java/org/argeo/util/ThroughputEditor.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/security/DigestUtils.java b/org.argeo.util/src/main/java/org/argeo/util/security/DigestUtils.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/security/DigestUtils.java rename to org.argeo.util/src/main/java/org/argeo/util/security/DigestUtils.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/security/Keyring.java b/org.argeo.util/src/main/java/org/argeo/util/security/Keyring.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/security/Keyring.java rename to org.argeo.util/src/main/java/org/argeo/util/security/Keyring.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/security/SimplePrincipal.java b/org.argeo.util/src/main/java/org/argeo/util/security/SimplePrincipal.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/security/SimplePrincipal.java rename to org.argeo.util/src/main/java/org/argeo/util/security/SimplePrincipal.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/ArrayTabularRow.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/CsvTabularWriter.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularColumn.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularColumn.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularColumn.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/TabularColumn.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularContent.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularContent.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularContent.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/TabularContent.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRow.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRow.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRow.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRow.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRowIterator.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRowIterator.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRowIterator.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/TabularRowIterator.java diff --git a/base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularWriter.java b/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularWriter.java similarity index 100% rename from base/runtime/org.argeo.util/src/main/java/org/argeo/util/tabular/TabularWriter.java rename to org.argeo.util/src/main/java/org/argeo/util/tabular/TabularWriter.java diff --git a/base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java b/org.argeo.util/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java similarity index 100% rename from base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java rename to org.argeo.util/src/test/java/org/argeo/util/CsvParserEncodingTestCase.java diff --git a/base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserParseFileTest.java b/org.argeo.util/src/test/java/org/argeo/util/CsvParserParseFileTest.java similarity index 100% rename from base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserParseFileTest.java rename to org.argeo.util/src/test/java/org/argeo/util/CsvParserParseFileTest.java diff --git a/base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserTestCase.java b/org.argeo.util/src/test/java/org/argeo/util/CsvParserTestCase.java similarity index 100% rename from base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserTestCase.java rename to org.argeo.util/src/test/java/org/argeo/util/CsvParserTestCase.java diff --git a/base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java b/org.argeo.util/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java similarity index 100% rename from base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java rename to org.argeo.util/src/test/java/org/argeo/util/CsvParserWithQuotedSeparatorTest.java diff --git a/base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvWriterTestCase.java b/org.argeo.util/src/test/java/org/argeo/util/CsvWriterTestCase.java similarity index 100% rename from base/runtime/org.argeo.util/src/test/java/org/argeo/util/CsvWriterTestCase.java rename to org.argeo.util/src/test/java/org/argeo/util/CsvWriterTestCase.java diff --git a/base/runtime/org.argeo.util/src/test/java/org/argeo/util/ThroughputTest.java b/org.argeo.util/src/test/java/org/argeo/util/ThroughputTest.java similarity index 100% rename from base/runtime/org.argeo.util/src/test/java/org/argeo/util/ThroughputTest.java rename to org.argeo.util/src/test/java/org/argeo/util/ThroughputTest.java diff --git a/base/runtime/org.argeo.util/src/test/resources/org/argeo/util/ReferenceFile.csv b/org.argeo.util/src/test/resources/org/argeo/util/ReferenceFile.csv similarity index 100% rename from base/runtime/org.argeo.util/src/test/resources/org/argeo/util/ReferenceFile.csv rename to org.argeo.util/src/test/resources/org/argeo/util/ReferenceFile.csv diff --git a/base/runtime/org.argeo.util/src/test/resources/org/argeo/util/TestParse-ISO.csv b/org.argeo.util/src/test/resources/org/argeo/util/TestParse-ISO.csv similarity index 100% rename from base/runtime/org.argeo.util/src/test/resources/org/argeo/util/TestParse-ISO.csv rename to org.argeo.util/src/test/resources/org/argeo/util/TestParse-ISO.csv diff --git a/base/runtime/org.argeo.util/src/test/resources/org/argeo/util/TestParse-UTF-8.csv b/org.argeo.util/src/test/resources/org/argeo/util/TestParse-UTF-8.csv similarity index 100% rename from base/runtime/org.argeo.util/src/test/resources/org/argeo/util/TestParse-UTF-8.csv rename to org.argeo.util/src/test/resources/org/argeo/util/TestParse-UTF-8.csv diff --git a/pom.xml b/pom.xml index 776d239d4..dbd3ed3cf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ - + 4.0.0 org.argeo.commons argeo-commons 2.1.12-SNAPSHOT Argeo Commons - Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring pom 2.1.12-SNAPSHOT @@ -21,9 +21,51 @@ UTF-8 - base - server - security + + org.argeo.util + org.argeo.osgi.boot + org.argeo.server.jcr + + org.argeo.eclipse.ui + org.argeo.eclipse.ui.jcr + org.argeo.eclipse.ui.rap + org.argeo.eclipse.ui.rcp + + org.argeo.security.core + org.argeo.security.jackrabbit + org.argeo.security.ldap + org.argeo.security.mvc + + org.argeo.security.auth.ldap + org.argeo.security.dao.ldap + org.argeo.security.dao.cli + org.argeo.security.dao.os + org.argeo.security.dao.jackrabbit + + org.argeo.server.jcr.mvc + org.argeo.server.jackrabbit + org.argeo.jackrabbit.webapp + org.argeo.server.ads + org.argeo.server.ads.server + org.argeo.server.rap.webapp + + org.argeo.node.repo.jackrabbit + + org.argeo.osgi.ui.explorer + org.argeo.jcr.ui.explorer + org.argeo.security.equinox + org.argeo.security.ui + org.argeo.security.ui.admin + + org.argeo.security.ui.rap + org.argeo.security.ui.rcp + + org.argeo.support.junit + org.argeo.server.core + org.argeo.ext.jdbm + + dep + dist Argeo @@ -94,7 +136,7 @@ limitations under the License. org.apache.maven.wagon wagon-webdav-jackrabbit - 2.2 + 2.8 @@ -104,19 +146,18 @@ limitations under the License. . - plugin.xml - META-INF/** - WEB-INF/** - icons/** - branding/** - img/** - theme/** - *.properties - properties/*.properties - p2.inf + ** + .* + .*/** + src/** + target/** + bin/** + pom.xml build.properties + *.bnd + *.target @@ -125,7 +166,7 @@ limitations under the License. maven-compiler-plugin - 2.3.2 + 3.2 1.6 1.6 @@ -133,7 +174,7 @@ limitations under the License. maven-source-plugin - 2.1.2 + 2.4 attach-sources @@ -143,10 +184,17 @@ limitations under the License. + + + + plugin.xml + META-INF/MANIFEST.MF + + maven-clean-plugin - 2.4.1 + 2.6.1 @@ -160,11 +208,11 @@ limitations under the License. maven-surefire-plugin - 2.12 + 2.18 maven-jar-plugin - 2.4 + 2.5 META-INF/MANIFEST.MF @@ -177,22 +225,22 @@ limitations under the License. maven-resources-plugin - 2.5 + 2.7 maven-dependency-plugin - 2.4 + 2.9 maven-release-plugin - 2.2.2 + 2.5.1 true maven-javadoc-plugin - 2.8.1 + 2.10.1 @@ -230,7 +278,7 @@ limitations under the License. org.codehaus.mojo rpm-maven-plugin - 2.1-alpha-1 + 2.1 true ${project.version} @@ -245,13 +293,13 @@ limitations under the License. org.codehaus.mojo exec-maven-plugin - 1.2.1 + 1.3.2 org.argeo.maven.plugins maven-argeo-osgi-plugin - 1.1.2 + 1.1.3-SNAPSHOT @@ -259,11 +307,11 @@ limitations under the License. maven-license-plugin 1.9.0 - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.14 - + + + + + maven-site-plugin @@ -446,34 +494,34 @@ limitations under the License. - - com.agilejava.docbkx - docbkx-maven-plugin - - doc/reference - target/site/reference - css/style.css - - - - - - - - - - - - - - - generate-html - generate-pdf - - pre-site - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/security/dep/pom.xml b/security/dep/pom.xml index 30ad62ec0..21884a008 100644 --- a/security/dep/pom.xml +++ b/security/dep/pom.xml @@ -7,7 +7,7 @@ security .. - org.argeo.commons.security + org.argeo.commons dep Commons Security Features pom diff --git a/security/modules/org.argeo.security.webapp/pom.xml b/security/modules/org.argeo.security.webapp/pom.xml index f72a93c6d..1f5cc2f57 100644 --- a/security/modules/org.argeo.security.webapp/pom.xml +++ b/security/modules/org.argeo.security.webapp/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.security + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.security.webapp diff --git a/security/modules/pom.xml b/security/modules/pom.xml index 28bdb5582..129e5b700 100644 --- a/security/modules/pom.xml +++ b/security/modules/pom.xml @@ -6,8 +6,8 @@ security .. - org.argeo.commons.security - modules + org.argeo.commons + argeo-commons pom Commons Security Modules diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml index 3ff81b961..ad5bc115f 100644 --- a/security/plugins/pom.xml +++ b/security/plugins/pom.xml @@ -6,8 +6,8 @@ security .. - org.argeo.commons.security - plugins + org.argeo.commons + argeo-commons Commons Security Eclipse Plugins pom diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml index b568ab4dc..bcbec028b 100644 --- a/security/runtime/org.argeo.security.activemq/pom.xml +++ b/security/runtime/org.argeo.security.activemq/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.security - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -38,12 +38,12 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - org.argeo.commons.security + org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml index 7f0516f60..c3fa23e44 100644 --- a/security/runtime/pom.xml +++ b/security/runtime/pom.xml @@ -7,8 +7,8 @@ security .. - org.argeo.commons.security - runtime + org.argeo.commons + argeo-commons Commons Security Runtime pom diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml index 0907ec653..e9272c4fe 100644 --- a/server/dep/org.argeo.server.dep.activemq/pom.xml +++ b/server/dep/org.argeo.server.dep.activemq/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -12,7 +12,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom @@ -52,7 +52,7 @@ - + diff --git a/server/dep/org.argeo.server.dep.hibernate/pom.xml b/server/dep/org.argeo.server.dep.hibernate/pom.xml index b493709b0..0f2e047a8 100644 --- a/server/dep/org.argeo.server.dep.hibernate/pom.xml +++ b/server/dep/org.argeo.server.dep.hibernate/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -12,7 +12,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml index 1188a0626..6f0ae7e84 100644 --- a/server/dep/org.argeo.server.dep.tomcat/pom.xml +++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT dep .. @@ -13,7 +13,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom @@ -21,12 +21,12 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.catalina 2.1.12-SNAPSHOT - org.argeo.commons.server + org.argeo.commons org.argeo.server.catalina.start 2.1.12-SNAPSHOT @@ -98,7 +98,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/server/dep/pom.xml b/server/dep/pom.xml index 244df7fd1..008fc2f47 100644 --- a/server/dep/pom.xml +++ b/server/dep/pom.xml @@ -7,7 +7,7 @@ server .. - org.argeo.commons.server + org.argeo.commons dep Commons Server Dependencies pom @@ -44,7 +44,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/server/modules/org.argeo.ext.bsf/pom.xml b/server/modules/org.argeo.ext.bsf/pom.xml index 47e4d3cca..d5907912e 100644 --- a/server/modules/org.argeo.ext.bsf/pom.xml +++ b/server/modules/org.argeo.ext.bsf/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - modules + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml index d5ee376ed..14cff8f4f 100644 --- a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml +++ b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.ext.jackrabbit.sybase diff --git a/server/modules/org.argeo.server.activemq.broker/pom.xml b/server/modules/org.argeo.server.activemq.broker/pom.xml index 3fef5ad4a..f62ae2505 100644 --- a/server/modules/org.argeo.server.activemq.broker/pom.xml +++ b/server/modules/org.argeo.server.activemq.broker/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.server.activemq.broker diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml index 8a8c0e754..59fd5fefd 100644 --- a/server/modules/org.argeo.server.catalina/pom.xml +++ b/server/modules/org.argeo.server.catalina/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.server.catalina diff --git a/server/modules/org.argeo.server.jdbc/pom.xml b/server/modules/org.argeo.server.jdbc/pom.xml index e8fddb17f..a5e5bf1ae 100644 --- a/server/modules/org.argeo.server.jdbc/pom.xml +++ b/server/modules/org.argeo.server.jdbc/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - modules + argeo-commons .. org.argeo.server.jdbc diff --git a/server/modules/pom.xml b/server/modules/pom.xml index 384c8a27e..18652f2ed 100644 --- a/server/modules/pom.xml +++ b/server/modules/pom.xml @@ -6,8 +6,8 @@ server .. - org.argeo.commons.server - modules + org.argeo.commons + argeo-commons pom Commons Server Modules diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index fc08789c7..bc96b87e7 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -6,8 +6,8 @@ server .. - org.argeo.commons.server - plugins + org.argeo.commons + argeo-commons Commons Server Eclipse Plugins pom diff --git a/server/runtime/org.argeo.server.catalina.start/pom.xml b/server/runtime/org.argeo.server.catalina.start/pom.xml index 85e9fe145..ce9d40597 100644 --- a/server/runtime/org.argeo.server.catalina.start/pom.xml +++ b/server/runtime/org.argeo.server.catalina.start/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.argeo.commons.server + org.argeo.commons 2.1.12-SNAPSHOT - runtime + argeo-commons .. org.argeo.server.catalina.start diff --git a/server/runtime/org.argeo.server.hibernate/pom.xml b/server/runtime/org.argeo.server.hibernate/pom.xml index 0cb8e2782..adbd42779 100644 --- a/server/runtime/org.argeo.server.hibernate/pom.xml +++ b/server/runtime/org.argeo.server.hibernate/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -38,14 +38,14 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.core 2.1.12-SNAPSHOT - org.argeo.commons.server + org.argeo.commons org.argeo.server.dep.hibernate 2.1.12-SNAPSHOT pom diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml index a66bfd618..abd44614c 100644 --- a/server/runtime/org.argeo.server.json/pom.xml +++ b/server/runtime/org.argeo.server.json/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -39,7 +39,7 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.core 2.1.12-SNAPSHOT diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml index 5d8032944..b75892a07 100644 --- a/server/runtime/org.argeo.server.jxl/pom.xml +++ b/server/runtime/org.argeo.server.jxl/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -39,7 +39,7 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.core 2.1.12-SNAPSHOT @@ -57,7 +57,7 @@ test - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml index 40ff85db4..d66de882b 100644 --- a/server/runtime/org.argeo.server.modeshape/pom.xml +++ b/server/runtime/org.argeo.server.modeshape/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. @@ -38,7 +38,7 @@ - org.argeo.commons.server + org.argeo.commons org.argeo.server.jcr 2.1.12-SNAPSHOT @@ -54,7 +54,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.dep.log4j 2.1.12-SNAPSHOT pom @@ -62,7 +62,7 @@ - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot 2.1.12-SNAPSHOT test diff --git a/server/runtime/org.argeo.server.webextender/pom.xml b/server/runtime/org.argeo.server.webextender/pom.xml index 5a8675474..aadf95af0 100644 --- a/server/runtime/org.argeo.server.webextender/pom.xml +++ b/server/runtime/org.argeo.server.webextender/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons 2.1.12-SNAPSHOT .. diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml index b3b4410ac..4c9e9dde2 100644 --- a/server/runtime/pom.xml +++ b/server/runtime/pom.xml @@ -7,8 +7,8 @@ server .. - org.argeo.commons.server - runtime + org.argeo.commons + argeo-commons Commons Server Runtime pom -- 2.30.2