From e66b9893b0e511f8ab295e3cee42b7dc966f1597 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 14 Sep 2016 14:16:57 +0000 Subject: [PATCH] Rename Commons bundles git-svn-id: https://svn.argeo.org/commons/trunk@9138 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.dep.cms.client/pom.xml | 2 +- dep/org.argeo.dep.cms.node/pom.xml | 6 +-- dep/org.argeo.dep.cms.platform/pom.xml | 11 ++---- .../.classpath | 0 .../.project | 2 +- .../META-INF/spring/commands.xml | 0 .../META-INF/spring/osgi.xml | 0 .../OSGI-INF/l10n/bundle.properties | 0 .../OSGI-INF/l10n/bundle_fr.properties | 0 .../OSGI-INF/l10n/bundle_ru.properties | 0 .../bnd.bnd | 2 +- .../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 | 4 +- .../security/ui/rap/AnonymousEntryPoint.java | 0 .../security/ui/rap/RapActionBarAdvisor.java | 0 .../security/ui/rap/RapWindowAdvisor.java | 0 .../security/ui/rap/RapWorkbenchAdvisor.java | 0 .../security/ui/rap/RapWorkbenchLogin.java | 0 .../security/ui/rap/SecureEntryPoint.java | 0 .../security/ui/rap/SecureRapActivator.java | 0 .../security/ui/rap/commands/OpenHome.java | 0 .../security/ui/rap/commands/UserMenu.java | 0 .../.classpath | 0 org.argeo.cms.ui.workbench/.project | 28 ++++++++++++++ .../META-INF/spring/commands.xml | 0 .../META-INF/spring/common.xml | 0 .../META-INF/spring/osgi.xml | 0 .../META-INF/spring/parts.xml | 0 .../bnd.bnd | 2 +- .../build.properties | 0 .../icons/add.gif | Bin .../icons/batch.gif | Bin .../icons/begin.gif | Bin .../icons/clear.gif | Bin .../icons/commit.gif | Bin .../icons/refresh.png | Bin .../icons/remove.gif | Bin .../icons/role.gif | Bin .../icons/rollback.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 | 6 +-- .../security-admin.properties | 0 .../ui/admin/SecurityAdminImages.java | 0 .../ui/admin/SecurityAdminPerspective.java | 0 .../ui/admin/SecurityAdminPlugin.java | 0 .../ui/admin/internal/PartStateChanged.java | 0 .../ui/admin/internal/UiAdminUtils.java | 0 .../admin/internal/UiUserAdminListener.java | 0 .../ui/admin/internal/UserAdminWrapper.java | 0 .../admin/internal/commands/DeleteGroups.java | 0 .../admin/internal/commands/DeleteUsers.java | 0 .../admin/internal/commands/ForceRefresh.java | 0 .../ui/admin/internal/commands/NewGroup.java | 0 .../ui/admin/internal/commands/NewUser.java | 0 .../internal/commands/SaveArgeoUser.java | 0 .../internal/commands/UserBatchUpdate.java | 0 .../commands/UserTransactionHandler.java | 0 .../internal/parts/ArgeoUserEditorInput.java | 0 .../internal/parts/DefaultUserMainPage.java | 0 .../admin/internal/parts/GroupMainPage.java | 0 .../ui/admin/internal/parts/GroupsView.java | 0 .../internal/parts/UserBatchUpdateWizard.java | 0 .../ui/admin/internal/parts/UserEditor.java | 0 .../admin/internal/parts/UserEditorInput.java | 0 .../ui/admin/internal/parts/UserMainPage.java | 0 .../ui/admin/internal/parts/UsersView.java | 0 .../internal/providers/CommonNameLP.java | 0 .../internal/providers/DomainNameLP.java | 0 .../ui/admin/internal/providers/MailLP.java | 0 .../admin/internal/providers/RoleIconLP.java | 0 .../providers/UserAdminAbstractLP.java | 0 .../internal/providers/UserDragListener.java | 0 .../admin/internal/providers/UserFilter.java | 0 .../admin/internal/providers/UserNameLP.java | 0 .../UserTableDefaultDClickListener.java | 0 .../providers/UserTransactionProvider.java | 0 org.argeo.cms/pom.xml | 8 ++-- org.argeo.eclipse.ui.workbench/pom.xml | 9 ++++- org.argeo.eclipse.ui/pom.xml | 7 +--- .../.classpath | 0 .../.project | 4 +- .../bnd.bnd | 0 .../build.properties | 0 .../ext/test/log4j.properties | 0 .../osgi/useradmin/BasicTestConstants.java | 0 .../argeo/osgi/useradmin/LdifParserTest.java | 0 .../osgi/useradmin/LdifUserAdminTest.java | 0 .../test/org/argeo/osgi/useradmin/basic.ldif | 0 .../pom.xml | 16 +------- .../osgi/useradmin/AbstractUserDirectory.java | 0 .../useradmin/AggregatingAuthorization.java | 0 .../osgi/useradmin/AggregatingUserAdmin.java | 0 .../org/argeo/osgi/useradmin/DigestUtils.java | 0 .../argeo/osgi/useradmin/DirectoryGroup.java | 0 .../argeo/osgi/useradmin/DirectoryUser.java | 0 .../argeo/osgi/useradmin/LdapUserAdmin.java | 0 .../osgi/useradmin/LdifAuthorization.java | 0 .../org/argeo/osgi/useradmin/LdifGroup.java | 0 .../org/argeo/osgi/useradmin/LdifName.java | 0 .../org/argeo/osgi/useradmin/LdifUser.java | 0 .../argeo/osgi/useradmin/LdifUserAdmin.java | 0 .../argeo/osgi/useradmin/UserAdminConf.java | 0 .../argeo/osgi/useradmin/UserDirectory.java | 0 .../useradmin/UserDirectoryException.java | 0 .../useradmin/UserDirectoryWorkingCopy.java | 0 .../argeo/osgi/useradmin/WcXaResource.java | 0 .../util/naming/AttributesDictionary.java | 0 .../src/org/argeo/util/naming/LdifParser.java | 0 .../src/org/argeo/util/naming/LdifWriter.java | 0 .../.classpath | 0 .../.project | 2 +- .../bnd.bnd | 0 .../build.properties | 2 +- .../ext/test/log4j.properties | 0 .../jackrabbit/JackrabbitAuthTest.java | 0 .../jackrabbit/repository-memory-test.xml | 0 .../pom.xml | 8 ++-- .../ArgeoAccessControlProvider.java | 0 .../jackrabbit/ArgeoAccessManager.java | 0 .../jackrabbit/ArgeoSecurityManager.java | 0 .../SystemJackrabbitLoginModule.java | 0 .../.project | 0 .../META-INF/spring/osgi.xml | 0 .../bnd.bnd | 2 +- .../build.properties | 0 .../pom.xml | 4 +- .../.classpath | 0 {org.argeo.cms.api => org.argeo.jcr}/.project | 2 +- .../bnd.bnd | 0 .../build.properties | 0 .../ext/test/log4j.properties | 0 .../argeo/jcr/docbook/DocBookModelTest.java | 0 .../argeo/jcr/docbook/WikipediaSample.dbk.xml | 0 .../ext/test/org/argeo/jcr/docbook/howto.xml | 0 .../org/argeo/jcr/tabular/JcrTabularTest.java | 0 .../server/jcr/JcrResourceAdapterTest.java | 0 .../ext/test/org/argeo/server/jcr/dummy00.xls | Bin .../ext/test/org/argeo/server/jcr/dummy01.xls | Bin .../ext/test/org/argeo/server/jcr/dummy02.xls | Bin .../ext/test/org/argeo/server/jcr/dummy03.xls | Bin .../pom.xml | 2 +- .../JackrabbitAdminLoginModule.java | 0 .../argeo/jackrabbit/JackrabbitContainer.java | 0 .../JackrabbitDataModelMigration.java | 0 .../JackrabbitRepositoryFactory.java | 0 .../argeo/jackrabbit/JackrabbitWrapper.java | 0 .../org/argeo/jackrabbit/repository-h2.xml | 0 .../argeo/jackrabbit/repository-localfs.xml | 0 .../argeo/jackrabbit/repository-memory.xml | 0 .../jackrabbit/repository-postgresql-ds.xml | 0 .../jackrabbit/repository-postgresql.xml | 0 .../servlet/OpenInViewSessionProvider.java | 0 .../jackrabbit/servlet/RemotingServlet.java | 0 .../jackrabbit/servlet/WebdavServlet.java | 0 .../unit/AbstractJackrabbitTestCase.java | 0 .../src/org/argeo/jackrabbit/unit/jaas.config | 0 .../argeo/jackrabbit/unit/repository-h2.xml | 0 .../jackrabbit/unit/repository-memory.xml | 0 .../src/org/argeo/jcr/ArgeoJcrConstants.java | 0 .../src/org/argeo/jcr/ArgeoJcrException.java | 0 .../src/org/argeo/jcr/ArgeoJcrUtils.java | 0 .../src/org/argeo/jcr/ArgeoNames.java | 0 .../src/org/argeo/jcr/ArgeoTypes.java | 0 .../org/argeo/jcr/CollectionNodeIterator.java | 0 .../src/org/argeo/jcr/DefaultJcrListener.java | 0 .../argeo/jcr/DefaultRepositoryFactory.java | 0 .../argeo/jcr/DefaultRepositoryRegister.java | 0 .../src/org/argeo/jcr/JcrCallback.java | 0 .../src/org/argeo/jcr/JcrMonitor.java | 0 .../org/argeo/jcr/JcrRepositoryWrapper.java | 0 .../src/org/argeo/jcr/JcrResourceAdapter.java | 0 .../org/argeo/jcr/JcrUrlStreamHandler.java | 0 .../src/org/argeo/jcr/JcrUtils.java | 0 .../src/org/argeo/jcr/PropertyDiff.java | 0 .../src/org/argeo/jcr/RepositoryRegister.java | 0 .../jcr/ThreadBoundJcrSessionFactory.java | 0 .../src/org/argeo/jcr/UserJcrUtils.java | 0 .../src/org/argeo/jcr/VersionDiff.java | 0 .../src/org/argeo/jcr/argeo.cnd | 0 .../org/argeo/jcr/docbook/DocBookModel.java | 0 .../org/argeo/jcr/docbook/DocBookNames.java | 0 .../org/argeo/jcr/docbook/docbook-full.cnd | 0 .../src/org/argeo/jcr/docbook/docbook.cnd | 0 .../src/org/argeo/jcr/fs/JcrFileStore.java | 0 .../src/org/argeo/jcr/fs/JcrFileSystem.java | 0 .../argeo/jcr/fs/JcrFileSystemProvider.java | 0 .../src/org/argeo/jcr/fs/JcrFsException.java | 0 .../src/org/argeo/jcr/fs/JcrPath.java | 0 .../org/argeo/jcr/proxy/AbstractUrlProxy.java | 0 .../org/argeo/jcr/proxy/ResourceProxy.java | 0 .../argeo/jcr/proxy/ResourceProxyServlet.java | 0 .../argeo/jcr/security/JcrAuthorizations.java | 0 .../org/argeo/jcr/security/JcrKeyring.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 .../.classpath | 0 .../.project | 4 +- .../bnd.bnd | 0 .../build.properties | 0 .../pom.xml | 4 +- .../src/org/argeo/node/ArgeoLogListener.java | 0 .../src/org/argeo/node/ArgeoLogger.java | 0 .../org/argeo/node/DataAdminPrincipal.java | 0 .../org/argeo/node/DataModelNamespace.java | 0 .../src/org/argeo/node/EnumAD.java | 0 .../src/org/argeo/node/EnumOCD.java | 0 .../src/org/argeo/node/NodeConstants.java | 0 .../src/org/argeo/node/NodeDeployment.java | 0 .../src/org/argeo/node/NodeInstance.java | 0 .../src/org/argeo/node/NodeOID.java | 0 .../src/org/argeo/node/NodeState.java | 0 .../src/org/argeo/node/RepoConf.java | 0 .../src/org/argeo/node/node.cnd | 0 .../src/org/argeo/node/package-info.java | 0 .../src/org/argeo/node/packageinfo | 0 .../src/org/argeo/osgi/boot/OsgiBoot.java | 25 +++++++------ org.argeo.security.jackrabbit/.project | 28 -------------- org.argeo.security.ui/pom.xml | 12 +++--- pom.xml | 35 ++++++++++-------- 240 files changed, 115 insertions(+), 122 deletions(-) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench.rap}/.classpath (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench.rap}/.project (93%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/META-INF/spring/commands.xml (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/META-INF/spring/osgi.xml (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/OSGI-INF/l10n/bundle.properties (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/OSGI-INF/l10n/bundle_fr.properties (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/OSGI-INF/l10n/bundle_ru.properties (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/bnd.bnd (83%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/branding/afterLogout.html (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/branding/empty.html (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/branding/favicon.ico (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/branding/login.html (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/branding/public.html (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/build.properties (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/icons/closeAll.gif (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/icons/exit.png (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/icons/home.gif (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/icons/main.gif (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/icons/password.gif (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/icons/preferences.png (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/plugin.xml (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/pom.xml (91%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/RapWindowAdvisor.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/SecureEntryPoint.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/SecureRapActivator.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/commands/OpenHome.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench.rap}/src/org/argeo/security/ui/rap/commands/UserMenu.java (100%) rename {org.argeo.security.ui.rap => org.argeo.cms.ui.workbench}/.classpath (100%) create mode 100644 org.argeo.cms.ui.workbench/.project rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/META-INF/spring/commands.xml (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/META-INF/spring/common.xml (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/META-INF/spring/osgi.xml (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/META-INF/spring/parts.xml (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/bnd.bnd (85%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/build.properties (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/add.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/batch.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/begin.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/clear.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/commit.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/refresh.png (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/remove.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/role.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/rollback.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/save.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/save_security.png (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/save_security_disabled.png (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/security.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/sync.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/user.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/icons/users.gif (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/plugin.xml (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/pom.xml (90%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/security-admin.properties (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/SecurityAdminImages.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/PartStateChanged.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/NewUser.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/parts/UsersView.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/MailLP.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java (100%) rename {org.argeo.security.ui.admin => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/.classpath (100%) rename {org.argeo.server.jcr => org.argeo.enterprise}/.project (94%) rename {org.argeo.security.core => org.argeo.enterprise}/bnd.bnd (100%) rename {org.argeo.security.core => org.argeo.enterprise}/build.properties (100%) rename {org.argeo.security.core => org.argeo.enterprise}/ext/test/log4j.properties (100%) rename {org.argeo.security.core => org.argeo.enterprise}/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/ext/test/org/argeo/osgi/useradmin/basic.ldif (100%) rename {org.argeo.security.core => org.argeo.enterprise}/pom.xml (51%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/DigestUtils.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/DirectoryGroup.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/DirectoryUser.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/LdapUserAdmin.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/LdifAuthorization.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/LdifGroup.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/LdifName.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/LdifUser.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/LdifUserAdmin.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/UserAdminConf.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/UserDirectory.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/UserDirectoryException.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/osgi/useradmin/WcXaResource.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/util/naming/AttributesDictionary.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/util/naming/LdifParser.java (100%) rename {org.argeo.security.core => org.argeo.enterprise}/src/org/argeo/util/naming/LdifWriter.java (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/.classpath (100%) rename {org.argeo.security.ui.rap => org.argeo.ext.jackrabbit}/.project (93%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/bnd.bnd (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/build.properties (95%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/ext/test/log4j.properties (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/ext/test/org/argeo/security/jackrabbit/JackrabbitAuthTest.java (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/ext/test/org/argeo/security/jackrabbit/repository-memory-test.xml (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/pom.xml (78%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/src/org/argeo/security/jackrabbit/ArgeoAccessControlProvider.java (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java (100%) rename {org.argeo.security.jackrabbit => org.argeo.ext.jackrabbit}/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java (100%) rename {org.argeo.eclipse.ui.workbench.rap => org.argeo.ext.rap.ui.workbench}/.project (100%) rename {org.argeo.eclipse.ui.workbench.rap => org.argeo.ext.rap.ui.workbench}/META-INF/spring/osgi.xml (100%) rename {org.argeo.eclipse.ui.workbench.rap => org.argeo.ext.rap.ui.workbench}/bnd.bnd (51%) rename {org.argeo.eclipse.ui.workbench.rap => org.argeo.ext.rap.ui.workbench}/build.properties (100%) rename {org.argeo.eclipse.ui.workbench.rap => org.argeo.ext.rap.ui.workbench}/pom.xml (80%) rename {org.argeo.server.jcr => org.argeo.jcr}/.classpath (100%) rename {org.argeo.cms.api => org.argeo.jcr}/.project (95%) rename {org.argeo.server.jcr => org.argeo.jcr}/bnd.bnd (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/build.properties (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/log4j.properties (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/jcr/docbook/DocBookModelTest.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/jcr/docbook/WikipediaSample.dbk.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/jcr/docbook/howto.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/server/jcr/dummy00.xls (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/server/jcr/dummy01.xls (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/server/jcr/dummy02.xls (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/ext/test/org/argeo/server/jcr/dummy03.xls (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/pom.xml (92%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/JackrabbitContainer.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/JackrabbitWrapper.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/repository-h2.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/repository-localfs.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/repository-memory.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/repository-postgresql-ds.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/repository-postgresql.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/servlet/RemotingServlet.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/servlet/WebdavServlet.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/unit/jaas.config (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/unit/repository-h2.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jackrabbit/unit/repository-memory.xml (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/ArgeoJcrConstants.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/ArgeoJcrException.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/ArgeoJcrUtils.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/ArgeoNames.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/ArgeoTypes.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/CollectionNodeIterator.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/DefaultJcrListener.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/DefaultRepositoryFactory.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/DefaultRepositoryRegister.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/JcrCallback.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/JcrMonitor.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/JcrRepositoryWrapper.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/JcrResourceAdapter.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/JcrUrlStreamHandler.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/JcrUtils.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/PropertyDiff.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/RepositoryRegister.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/UserJcrUtils.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/VersionDiff.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/argeo.cnd (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/docbook/DocBookModel.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/docbook/DocBookNames.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/docbook/docbook-full.cnd (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/docbook/docbook.cnd (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/fs/JcrFileStore.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/fs/JcrFileSystem.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/fs/JcrFileSystemProvider.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/fs/JcrFsException.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/fs/JcrPath.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/proxy/AbstractUrlProxy.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/proxy/ResourceProxy.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/proxy/ResourceProxyServlet.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/security/JcrAuthorizations.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/security/JcrKeyring.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/spring/ThreadBoundSession.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/tabular/JcrTabularRowIterator.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/tabular/JcrTabularWriter.java (100%) rename {org.argeo.server.jcr => org.argeo.jcr}/src/org/argeo/jcr/unit/AbstractJcrTestCase.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/.classpath (100%) rename {org.argeo.security.core => org.argeo.node.api}/.project (94%) rename {org.argeo.cms.api => org.argeo.node.api}/bnd.bnd (100%) rename {org.argeo.cms.api => org.argeo.node.api}/build.properties (100%) rename {org.argeo.cms.api => org.argeo.node.api}/pom.xml (86%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/ArgeoLogListener.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/ArgeoLogger.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/DataAdminPrincipal.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/DataModelNamespace.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/EnumAD.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/EnumOCD.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/NodeConstants.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/NodeDeployment.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/NodeInstance.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/NodeOID.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/NodeState.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/RepoConf.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/node.cnd (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/package-info.java (100%) rename {org.argeo.cms.api => org.argeo.node.api}/src/org/argeo/node/packageinfo (100%) delete mode 100644 org.argeo.security.jackrabbit/.project diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index da2dc1160..ca8f8adbb 100644 --- a/dep/org.argeo.dep.cms.client/pom.xml +++ b/dep/org.argeo.dep.cms.client/pom.xml @@ -19,7 +19,7 @@ org.argeo.commons - org.argeo.server.jcr + org.argeo.jcr 2.1.46-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index 1cf3918b3..1c0808965 100644 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@ -19,7 +19,7 @@ org.argeo.commons - org.argeo.cms.api + org.argeo.node.api 2.1.46-SNAPSHOT @@ -29,12 +29,12 @@ org.argeo.commons - org.argeo.security.core + org.argeo.enterprise 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.security.jackrabbit + org.argeo.ext.jackrabbit 2.1.46-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml index b450008ed..91a354198 100644 --- a/dep/org.argeo.dep.cms.platform/pom.xml +++ b/dep/org.argeo.dep.cms.platform/pom.xml @@ -17,11 +17,6 @@ org.argeo.dep.cms.node 2.1.46-SNAPSHOT - - org.argeo.commons - org.argeo.security.core - 2.1.46-SNAPSHOT - org.argeo.commons org.argeo.security.ui @@ -34,17 +29,17 @@ org.argeo.commons - org.argeo.security.ui.admin + org.argeo.cms.ui.workbench 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.eclipse.ui.workbench.rap + org.argeo.ext.rap.ui.workbench 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.security.ui.rap + org.argeo.cms.ui.workbench 2.1.46-SNAPSHOT diff --git a/org.argeo.security.ui.admin/.classpath b/org.argeo.cms.ui.workbench.rap/.classpath similarity index 100% rename from org.argeo.security.ui.admin/.classpath rename to org.argeo.cms.ui.workbench.rap/.classpath diff --git a/org.argeo.security.ui.admin/.project b/org.argeo.cms.ui.workbench.rap/.project similarity index 93% rename from org.argeo.security.ui.admin/.project rename to org.argeo.cms.ui.workbench.rap/.project index 9821dd947..49b4b902d 100644 --- a/org.argeo.security.ui.admin/.project +++ b/org.argeo.cms.ui.workbench.rap/.project @@ -1,6 +1,6 @@ - org.argeo.security.ui.admin + org.argeo.cms.ui.workbench.rap diff --git a/org.argeo.security.ui.rap/META-INF/spring/commands.xml b/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml similarity index 100% rename from org.argeo.security.ui.rap/META-INF/spring/commands.xml rename to org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml diff --git a/org.argeo.security.ui.rap/META-INF/spring/osgi.xml b/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml similarity index 100% rename from org.argeo.security.ui.rap/META-INF/spring/osgi.xml rename to org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml diff --git a/org.argeo.security.ui.rap/OSGI-INF/l10n/bundle.properties b/org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle.properties similarity index 100% rename from org.argeo.security.ui.rap/OSGI-INF/l10n/bundle.properties rename to org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle.properties diff --git a/org.argeo.security.ui.rap/OSGI-INF/l10n/bundle_fr.properties b/org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_fr.properties similarity index 100% rename from org.argeo.security.ui.rap/OSGI-INF/l10n/bundle_fr.properties rename to org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_fr.properties diff --git a/org.argeo.security.ui.rap/OSGI-INF/l10n/bundle_ru.properties b/org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_ru.properties similarity index 100% rename from org.argeo.security.ui.rap/OSGI-INF/l10n/bundle_ru.properties rename to org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_ru.properties diff --git a/org.argeo.security.ui.rap/bnd.bnd b/org.argeo.cms.ui.workbench.rap/bnd.bnd similarity index 83% rename from org.argeo.security.ui.rap/bnd.bnd rename to org.argeo.cms.ui.workbench.rap/bnd.bnd index 1da6c05d5..31a99179c 100644 --- a/org.argeo.security.ui.rap/bnd.bnd +++ b/org.argeo.cms.ui.workbench.rap/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-SymbolicName: org.argeo.security.ui.rap;singleton:=true +Bundle-SymbolicName: org.argeo.cms.ui.workbench.rap;singleton:=true Bundle-Activator: org.argeo.security.ui.rap.SecureRapActivator Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime diff --git a/org.argeo.security.ui.rap/branding/afterLogout.html b/org.argeo.cms.ui.workbench.rap/branding/afterLogout.html similarity index 100% rename from org.argeo.security.ui.rap/branding/afterLogout.html rename to org.argeo.cms.ui.workbench.rap/branding/afterLogout.html diff --git a/org.argeo.security.ui.rap/branding/empty.html b/org.argeo.cms.ui.workbench.rap/branding/empty.html similarity index 100% rename from org.argeo.security.ui.rap/branding/empty.html rename to org.argeo.cms.ui.workbench.rap/branding/empty.html diff --git a/org.argeo.security.ui.rap/branding/favicon.ico b/org.argeo.cms.ui.workbench.rap/branding/favicon.ico similarity index 100% rename from org.argeo.security.ui.rap/branding/favicon.ico rename to org.argeo.cms.ui.workbench.rap/branding/favicon.ico diff --git a/org.argeo.security.ui.rap/branding/login.html b/org.argeo.cms.ui.workbench.rap/branding/login.html similarity index 100% rename from org.argeo.security.ui.rap/branding/login.html rename to org.argeo.cms.ui.workbench.rap/branding/login.html diff --git a/org.argeo.security.ui.rap/branding/public.html b/org.argeo.cms.ui.workbench.rap/branding/public.html similarity index 100% rename from org.argeo.security.ui.rap/branding/public.html rename to org.argeo.cms.ui.workbench.rap/branding/public.html diff --git a/org.argeo.security.ui.rap/build.properties b/org.argeo.cms.ui.workbench.rap/build.properties similarity index 100% rename from org.argeo.security.ui.rap/build.properties rename to org.argeo.cms.ui.workbench.rap/build.properties diff --git a/org.argeo.security.ui.rap/icons/closeAll.gif b/org.argeo.cms.ui.workbench.rap/icons/closeAll.gif similarity index 100% rename from org.argeo.security.ui.rap/icons/closeAll.gif rename to org.argeo.cms.ui.workbench.rap/icons/closeAll.gif diff --git a/org.argeo.security.ui.rap/icons/exit.png b/org.argeo.cms.ui.workbench.rap/icons/exit.png similarity index 100% rename from org.argeo.security.ui.rap/icons/exit.png rename to org.argeo.cms.ui.workbench.rap/icons/exit.png diff --git a/org.argeo.security.ui.rap/icons/home.gif b/org.argeo.cms.ui.workbench.rap/icons/home.gif similarity index 100% rename from org.argeo.security.ui.rap/icons/home.gif rename to org.argeo.cms.ui.workbench.rap/icons/home.gif diff --git a/org.argeo.security.ui.rap/icons/main.gif b/org.argeo.cms.ui.workbench.rap/icons/main.gif similarity index 100% rename from org.argeo.security.ui.rap/icons/main.gif rename to org.argeo.cms.ui.workbench.rap/icons/main.gif diff --git a/org.argeo.security.ui.rap/icons/password.gif b/org.argeo.cms.ui.workbench.rap/icons/password.gif similarity index 100% rename from org.argeo.security.ui.rap/icons/password.gif rename to org.argeo.cms.ui.workbench.rap/icons/password.gif diff --git a/org.argeo.security.ui.rap/icons/preferences.png b/org.argeo.cms.ui.workbench.rap/icons/preferences.png similarity index 100% rename from org.argeo.security.ui.rap/icons/preferences.png rename to org.argeo.cms.ui.workbench.rap/icons/preferences.png diff --git a/org.argeo.security.ui.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml similarity index 100% rename from org.argeo.security.ui.rap/plugin.xml rename to org.argeo.cms.ui.workbench.rap/plugin.xml diff --git a/org.argeo.security.ui.rap/pom.xml b/org.argeo.cms.ui.workbench.rap/pom.xml similarity index 91% rename from org.argeo.security.ui.rap/pom.xml rename to org.argeo.cms.ui.workbench.rap/pom.xml index 5f8c9943d..2822051e2 100644 --- a/org.argeo.security.ui.rap/pom.xml +++ b/org.argeo.cms.ui.workbench.rap/pom.xml @@ -7,8 +7,8 @@ argeo-commons .. - org.argeo.security.ui.rap - Commons CMS Workbench RAP + org.argeo.cms.ui.workbench.rap + CMS Workbench RAP jar diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java similarity index 100% rename from org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java diff --git a/org.argeo.security.ui.rap/.classpath b/org.argeo.cms.ui.workbench/.classpath similarity index 100% rename from org.argeo.security.ui.rap/.classpath rename to org.argeo.cms.ui.workbench/.classpath diff --git a/org.argeo.cms.ui.workbench/.project b/org.argeo.cms.ui.workbench/.project new file mode 100644 index 000000000..f7f7a8e6a --- /dev/null +++ b/org.argeo.cms.ui.workbench/.project @@ -0,0 +1,28 @@ + + + org.argeo.cms.ui.workbench + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.argeo.security.ui.admin/META-INF/spring/commands.xml b/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml similarity index 100% rename from org.argeo.security.ui.admin/META-INF/spring/commands.xml rename to org.argeo.cms.ui.workbench/META-INF/spring/commands.xml diff --git a/org.argeo.security.ui.admin/META-INF/spring/common.xml b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml similarity index 100% rename from org.argeo.security.ui.admin/META-INF/spring/common.xml rename to org.argeo.cms.ui.workbench/META-INF/spring/common.xml diff --git a/org.argeo.security.ui.admin/META-INF/spring/osgi.xml b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml similarity index 100% rename from org.argeo.security.ui.admin/META-INF/spring/osgi.xml rename to org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml diff --git a/org.argeo.security.ui.admin/META-INF/spring/parts.xml b/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml similarity index 100% rename from org.argeo.security.ui.admin/META-INF/spring/parts.xml rename to org.argeo.cms.ui.workbench/META-INF/spring/parts.xml diff --git a/org.argeo.security.ui.admin/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd similarity index 85% rename from org.argeo.security.ui.admin/bnd.bnd rename to org.argeo.cms.ui.workbench/bnd.bnd index d5f00ceaf..4ace8db0e 100644 --- a/org.argeo.security.ui.admin/bnd.bnd +++ b/org.argeo.cms.ui.workbench/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-SymbolicName: org.argeo.security.ui.admin;singleton:=true +Bundle-SymbolicName: org.argeo.cms.ui.workbench;singleton:=true Bundle-Activator: org.argeo.security.ui.admin.SecurityAdminPlugin Bundle-ActivationPolicy: lazy diff --git a/org.argeo.security.ui.admin/build.properties b/org.argeo.cms.ui.workbench/build.properties similarity index 100% rename from org.argeo.security.ui.admin/build.properties rename to org.argeo.cms.ui.workbench/build.properties diff --git a/org.argeo.security.ui.admin/icons/add.gif b/org.argeo.cms.ui.workbench/icons/add.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/add.gif rename to org.argeo.cms.ui.workbench/icons/add.gif diff --git a/org.argeo.security.ui.admin/icons/batch.gif b/org.argeo.cms.ui.workbench/icons/batch.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/batch.gif rename to org.argeo.cms.ui.workbench/icons/batch.gif diff --git a/org.argeo.security.ui.admin/icons/begin.gif b/org.argeo.cms.ui.workbench/icons/begin.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/begin.gif rename to org.argeo.cms.ui.workbench/icons/begin.gif diff --git a/org.argeo.security.ui.admin/icons/clear.gif b/org.argeo.cms.ui.workbench/icons/clear.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/clear.gif rename to org.argeo.cms.ui.workbench/icons/clear.gif diff --git a/org.argeo.security.ui.admin/icons/commit.gif b/org.argeo.cms.ui.workbench/icons/commit.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/commit.gif rename to org.argeo.cms.ui.workbench/icons/commit.gif diff --git a/org.argeo.security.ui.admin/icons/refresh.png b/org.argeo.cms.ui.workbench/icons/refresh.png similarity index 100% rename from org.argeo.security.ui.admin/icons/refresh.png rename to org.argeo.cms.ui.workbench/icons/refresh.png diff --git a/org.argeo.security.ui.admin/icons/remove.gif b/org.argeo.cms.ui.workbench/icons/remove.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/remove.gif rename to org.argeo.cms.ui.workbench/icons/remove.gif diff --git a/org.argeo.security.ui.admin/icons/role.gif b/org.argeo.cms.ui.workbench/icons/role.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/role.gif rename to org.argeo.cms.ui.workbench/icons/role.gif diff --git a/org.argeo.security.ui.admin/icons/rollback.gif b/org.argeo.cms.ui.workbench/icons/rollback.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/rollback.gif rename to org.argeo.cms.ui.workbench/icons/rollback.gif diff --git a/org.argeo.security.ui.admin/icons/save.gif b/org.argeo.cms.ui.workbench/icons/save.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/save.gif rename to org.argeo.cms.ui.workbench/icons/save.gif diff --git a/org.argeo.security.ui.admin/icons/save_security.png b/org.argeo.cms.ui.workbench/icons/save_security.png similarity index 100% rename from org.argeo.security.ui.admin/icons/save_security.png rename to org.argeo.cms.ui.workbench/icons/save_security.png diff --git a/org.argeo.security.ui.admin/icons/save_security_disabled.png b/org.argeo.cms.ui.workbench/icons/save_security_disabled.png similarity index 100% rename from org.argeo.security.ui.admin/icons/save_security_disabled.png rename to org.argeo.cms.ui.workbench/icons/save_security_disabled.png diff --git a/org.argeo.security.ui.admin/icons/security.gif b/org.argeo.cms.ui.workbench/icons/security.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/security.gif rename to org.argeo.cms.ui.workbench/icons/security.gif diff --git a/org.argeo.security.ui.admin/icons/sync.gif b/org.argeo.cms.ui.workbench/icons/sync.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/sync.gif rename to org.argeo.cms.ui.workbench/icons/sync.gif diff --git a/org.argeo.security.ui.admin/icons/user.gif b/org.argeo.cms.ui.workbench/icons/user.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/user.gif rename to org.argeo.cms.ui.workbench/icons/user.gif diff --git a/org.argeo.security.ui.admin/icons/users.gif b/org.argeo.cms.ui.workbench/icons/users.gif similarity index 100% rename from org.argeo.security.ui.admin/icons/users.gif rename to org.argeo.cms.ui.workbench/icons/users.gif diff --git a/org.argeo.security.ui.admin/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml similarity index 100% rename from org.argeo.security.ui.admin/plugin.xml rename to org.argeo.cms.ui.workbench/plugin.xml diff --git a/org.argeo.security.ui.admin/pom.xml b/org.argeo.cms.ui.workbench/pom.xml similarity index 90% rename from org.argeo.security.ui.admin/pom.xml rename to org.argeo.cms.ui.workbench/pom.xml index 3650ced6b..ead8e2e84 100644 --- a/org.argeo.security.ui.admin/pom.xml +++ b/org.argeo.cms.ui.workbench/pom.xml @@ -7,8 +7,8 @@ argeo-commons .. - org.argeo.security.ui.admin - Commons CMS Workbench Admin + org.argeo.cms.ui.workbench + CMS Workbench jar @@ -28,7 +28,7 @@ org.argeo.commons - org.argeo.security.core + org.argeo.enterprise 2.1.46-SNAPSHOT diff --git a/org.argeo.security.ui.admin/security-admin.properties b/org.argeo.cms.ui.workbench/security-admin.properties similarity index 100% rename from org.argeo.security.ui.admin/security-admin.properties rename to org.argeo.cms.ui.workbench/security-admin.properties diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/SecurityAdminImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/SecurityAdminImages.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/PartStateChanged.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/PartStateChanged.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/PartStateChanged.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/PartStateChanged.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UsersView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UsersView.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/MailLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/MailLP.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/MailLP.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/MailLP.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java similarity index 100% rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 2a27b6334..dbbe1590d 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -8,22 +8,22 @@ .. org.argeo.cms - Commons CMS + Argeo CMS jar org.argeo.commons - org.argeo.cms.api + org.argeo.node.api 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.server.jcr + org.argeo.jcr 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.security.core + org.argeo.enterprise 2.1.46-SNAPSHOT diff --git a/org.argeo.eclipse.ui.workbench/pom.xml b/org.argeo.eclipse.ui.workbench/pom.xml index e12e5170d..612897f39 100644 --- a/org.argeo.eclipse.ui.workbench/pom.xml +++ b/org.argeo.eclipse.ui.workbench/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.commons @@ -25,5 +26,11 @@ 2.1.46-SNAPSHOT provided + + + org.argeo.commons + org.argeo.enterprise + 2.1.46-SNAPSHOT + \ No newline at end of file diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 9c1813513..d5f26c54b 100644 --- a/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.eclipse.ui/pom.xml @@ -17,12 +17,7 @@ org.argeo.commons - org.argeo.server.jcr - 2.1.46-SNAPSHOT - - - org.argeo.commons - org.argeo.security.core + org.argeo.jcr 2.1.46-SNAPSHOT diff --git a/org.argeo.security.core/.classpath b/org.argeo.enterprise/.classpath similarity index 100% rename from org.argeo.security.core/.classpath rename to org.argeo.enterprise/.classpath diff --git a/org.argeo.server.jcr/.project b/org.argeo.enterprise/.project similarity index 94% rename from org.argeo.server.jcr/.project rename to org.argeo.enterprise/.project index 977218c59..5de2f0acf 100644 --- a/org.argeo.server.jcr/.project +++ b/org.argeo.enterprise/.project @@ -1,6 +1,6 @@ - org.argeo.server.jcr + org.argeo.enterprise @@ -22,7 +22,7 @@ - org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature diff --git a/org.argeo.security.core/bnd.bnd b/org.argeo.enterprise/bnd.bnd similarity index 100% rename from org.argeo.security.core/bnd.bnd rename to org.argeo.enterprise/bnd.bnd diff --git a/org.argeo.security.core/build.properties b/org.argeo.enterprise/build.properties similarity index 100% rename from org.argeo.security.core/build.properties rename to org.argeo.enterprise/build.properties diff --git a/org.argeo.security.core/ext/test/log4j.properties b/org.argeo.enterprise/ext/test/log4j.properties similarity index 100% rename from org.argeo.security.core/ext/test/log4j.properties rename to org.argeo.enterprise/ext/test/log4j.properties diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java similarity index 100% rename from org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java rename to org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java similarity index 100% rename from org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java rename to org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java similarity index 100% rename from org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java rename to org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/basic.ldif b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/basic.ldif similarity index 100% rename from org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/basic.ldif rename to org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/basic.ldif diff --git a/org.argeo.security.core/pom.xml b/org.argeo.enterprise/pom.xml similarity index 51% rename from org.argeo.security.core/pom.xml rename to org.argeo.enterprise/pom.xml index 56c2cfd5b..b8e8377cf 100644 --- a/org.argeo.security.core/pom.xml +++ b/org.argeo.enterprise/pom.xml @@ -7,18 +7,6 @@ 2.1.46-SNAPSHOT .. - org.argeo.security.core - Commons Security - - - org.argeo.commons - org.argeo.util - 2.1.46-SNAPSHOT - - - org.argeo.commons - org.argeo.server.jcr - 2.1.46-SNAPSHOT - - + org.argeo.enterprise + Commons Enterprise \ No newline at end of file diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/DigestUtils.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/DigestUtils.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/DigestUtils.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/DigestUtils.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/DirectoryGroup.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryGroup.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/DirectoryGroup.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryGroup.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/DirectoryUser.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryUser.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/DirectoryUser.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryUser.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifAuthorization.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifAuthorization.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifAuthorization.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifAuthorization.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifGroup.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifGroup.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifGroup.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifGroup.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifName.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifName.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifName.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifName.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUser.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUser.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUser.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUser.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserAdminConf.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserAdminConf.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/UserAdminConf.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserAdminConf.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserDirectory.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectory.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/UserDirectory.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectory.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserDirectoryException.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryException.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/UserDirectoryException.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryException.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/WcXaResource.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/osgi/useradmin/WcXaResource.java rename to org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java diff --git a/org.argeo.security.core/src/org/argeo/util/naming/AttributesDictionary.java b/org.argeo.enterprise/src/org/argeo/util/naming/AttributesDictionary.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/util/naming/AttributesDictionary.java rename to org.argeo.enterprise/src/org/argeo/util/naming/AttributesDictionary.java diff --git a/org.argeo.security.core/src/org/argeo/util/naming/LdifParser.java b/org.argeo.enterprise/src/org/argeo/util/naming/LdifParser.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/util/naming/LdifParser.java rename to org.argeo.enterprise/src/org/argeo/util/naming/LdifParser.java diff --git a/org.argeo.security.core/src/org/argeo/util/naming/LdifWriter.java b/org.argeo.enterprise/src/org/argeo/util/naming/LdifWriter.java similarity index 100% rename from org.argeo.security.core/src/org/argeo/util/naming/LdifWriter.java rename to org.argeo.enterprise/src/org/argeo/util/naming/LdifWriter.java diff --git a/org.argeo.security.jackrabbit/.classpath b/org.argeo.ext.jackrabbit/.classpath similarity index 100% rename from org.argeo.security.jackrabbit/.classpath rename to org.argeo.ext.jackrabbit/.classpath diff --git a/org.argeo.security.ui.rap/.project b/org.argeo.ext.jackrabbit/.project similarity index 93% rename from org.argeo.security.ui.rap/.project rename to org.argeo.ext.jackrabbit/.project index d20bec7fc..fde35ccc8 100644 --- a/org.argeo.security.ui.rap/.project +++ b/org.argeo.ext.jackrabbit/.project @@ -1,6 +1,6 @@ - org.argeo.security.ui.rap + org.argeo.ext.jackrabbit diff --git a/org.argeo.security.jackrabbit/bnd.bnd b/org.argeo.ext.jackrabbit/bnd.bnd similarity index 100% rename from org.argeo.security.jackrabbit/bnd.bnd rename to org.argeo.ext.jackrabbit/bnd.bnd diff --git a/org.argeo.security.jackrabbit/build.properties b/org.argeo.ext.jackrabbit/build.properties similarity index 95% rename from org.argeo.security.jackrabbit/build.properties rename to org.argeo.ext.jackrabbit/build.properties index 0cc2cd06c..8cc339269 100644 --- a/org.argeo.security.jackrabbit/build.properties +++ b/org.argeo.ext.jackrabbit/build.properties @@ -19,5 +19,5 @@ additional.bundles = org.junit,\ org.apache.tika.core,\ org.apache.commons.dbcp,\ org.apache.commons.pool,\ - org.argeo.server.jcr + org.argeo.jcr diff --git a/org.argeo.security.jackrabbit/ext/test/log4j.properties b/org.argeo.ext.jackrabbit/ext/test/log4j.properties similarity index 100% rename from org.argeo.security.jackrabbit/ext/test/log4j.properties rename to org.argeo.ext.jackrabbit/ext/test/log4j.properties diff --git a/org.argeo.security.jackrabbit/ext/test/org/argeo/security/jackrabbit/JackrabbitAuthTest.java b/org.argeo.ext.jackrabbit/ext/test/org/argeo/security/jackrabbit/JackrabbitAuthTest.java similarity index 100% rename from org.argeo.security.jackrabbit/ext/test/org/argeo/security/jackrabbit/JackrabbitAuthTest.java rename to org.argeo.ext.jackrabbit/ext/test/org/argeo/security/jackrabbit/JackrabbitAuthTest.java diff --git a/org.argeo.security.jackrabbit/ext/test/org/argeo/security/jackrabbit/repository-memory-test.xml b/org.argeo.ext.jackrabbit/ext/test/org/argeo/security/jackrabbit/repository-memory-test.xml similarity index 100% rename from org.argeo.security.jackrabbit/ext/test/org/argeo/security/jackrabbit/repository-memory-test.xml rename to org.argeo.ext.jackrabbit/ext/test/org/argeo/security/jackrabbit/repository-memory-test.xml diff --git a/org.argeo.security.jackrabbit/pom.xml b/org.argeo.ext.jackrabbit/pom.xml similarity index 78% rename from org.argeo.security.jackrabbit/pom.xml rename to org.argeo.ext.jackrabbit/pom.xml index 1dfc10325..15d5e618f 100644 --- a/org.argeo.security.jackrabbit/pom.xml +++ b/org.argeo.ext.jackrabbit/pom.xml @@ -7,19 +7,19 @@ 2.1.46-SNAPSHOT .. - org.argeo.security.jackrabbit - Commons Jackrabbit Extensions + org.argeo.ext.jackrabbit + Extensions Apache Jackrabbit org.argeo.commons - org.argeo.cms.api + org.argeo.node.api 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.server.jcr + org.argeo.jcr 2.1.46-SNAPSHOT test diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessControlProvider.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessControlProvider.java similarity index 100% rename from org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessControlProvider.java rename to org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessControlProvider.java diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java similarity index 100% rename from org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java rename to org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoAccessManager.java diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java similarity index 100% rename from org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java rename to org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java similarity index 100% rename from org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java rename to org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java diff --git a/org.argeo.eclipse.ui.workbench.rap/.project b/org.argeo.ext.rap.ui.workbench/.project similarity index 100% rename from org.argeo.eclipse.ui.workbench.rap/.project rename to org.argeo.ext.rap.ui.workbench/.project diff --git a/org.argeo.eclipse.ui.workbench.rap/META-INF/spring/osgi.xml b/org.argeo.ext.rap.ui.workbench/META-INF/spring/osgi.xml similarity index 100% rename from org.argeo.eclipse.ui.workbench.rap/META-INF/spring/osgi.xml rename to org.argeo.ext.rap.ui.workbench/META-INF/spring/osgi.xml diff --git a/org.argeo.eclipse.ui.workbench.rap/bnd.bnd b/org.argeo.ext.rap.ui.workbench/bnd.bnd similarity index 51% rename from org.argeo.eclipse.ui.workbench.rap/bnd.bnd rename to org.argeo.ext.rap.ui.workbench/bnd.bnd index 1b2939e64..48c602a93 100644 --- a/org.argeo.eclipse.ui.workbench.rap/bnd.bnd +++ b/org.argeo.ext.rap.ui.workbench/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-SymbolicName: org.argeo.eclipse.ui.workbench.rap;singleton:=true +Bundle-SymbolicName: org.argeo.ext.rap.ui.workbench;singleton:=true Bundle-ActivationPolicy: lazy Fragment-Host: org.eclipse.rap.ui.workbench diff --git a/org.argeo.eclipse.ui.workbench.rap/build.properties b/org.argeo.ext.rap.ui.workbench/build.properties similarity index 100% rename from org.argeo.eclipse.ui.workbench.rap/build.properties rename to org.argeo.ext.rap.ui.workbench/build.properties diff --git a/org.argeo.eclipse.ui.workbench.rap/pom.xml b/org.argeo.ext.rap.ui.workbench/pom.xml similarity index 80% rename from org.argeo.eclipse.ui.workbench.rap/pom.xml rename to org.argeo.ext.rap.ui.workbench/pom.xml index baf0d301f..d45618a77 100644 --- a/org.argeo.eclipse.ui.workbench.rap/pom.xml +++ b/org.argeo.ext.rap.ui.workbench/pom.xml @@ -6,6 +6,6 @@ argeo-commons .. - org.argeo.eclipse.ui.workbench.rap - Commons Eclipse Workbench RAP + org.argeo.ext.rap.ui.workbench + Extensions Eclipse RAP Workbench diff --git a/org.argeo.server.jcr/.classpath b/org.argeo.jcr/.classpath similarity index 100% rename from org.argeo.server.jcr/.classpath rename to org.argeo.jcr/.classpath diff --git a/org.argeo.cms.api/.project b/org.argeo.jcr/.project similarity index 95% rename from org.argeo.cms.api/.project rename to org.argeo.jcr/.project index 346a99ff4..e432547c7 100644 --- a/org.argeo.cms.api/.project +++ b/org.argeo.jcr/.project @@ -1,6 +1,6 @@ - org.argeo.cms.api + org.argeo.jcr diff --git a/org.argeo.server.jcr/bnd.bnd b/org.argeo.jcr/bnd.bnd similarity index 100% rename from org.argeo.server.jcr/bnd.bnd rename to org.argeo.jcr/bnd.bnd diff --git a/org.argeo.server.jcr/build.properties b/org.argeo.jcr/build.properties similarity index 100% rename from org.argeo.server.jcr/build.properties rename to org.argeo.jcr/build.properties diff --git a/org.argeo.server.jcr/ext/test/log4j.properties b/org.argeo.jcr/ext/test/log4j.properties similarity index 100% rename from org.argeo.server.jcr/ext/test/log4j.properties rename to org.argeo.jcr/ext/test/log4j.properties diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/docbook/DocBookModelTest.java b/org.argeo.jcr/ext/test/org/argeo/jcr/docbook/DocBookModelTest.java similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/docbook/DocBookModelTest.java rename to org.argeo.jcr/ext/test/org/argeo/jcr/docbook/DocBookModelTest.java diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/docbook/WikipediaSample.dbk.xml b/org.argeo.jcr/ext/test/org/argeo/jcr/docbook/WikipediaSample.dbk.xml similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/docbook/WikipediaSample.dbk.xml rename to org.argeo.jcr/ext/test/org/argeo/jcr/docbook/WikipediaSample.dbk.xml diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/docbook/howto.xml b/org.argeo.jcr/ext/test/org/argeo/jcr/docbook/howto.xml similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/docbook/howto.xml rename to org.argeo.jcr/ext/test/org/argeo/jcr/docbook/howto.xml diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java b/org.argeo.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java rename to org.argeo.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java diff --git a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java b/org.argeo.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java rename to org.argeo.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java diff --git a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy00.xls b/org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy00.xls similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy00.xls rename to org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy00.xls diff --git a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy01.xls b/org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy01.xls similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy01.xls rename to org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy01.xls diff --git a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy02.xls b/org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy02.xls similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy02.xls rename to org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy02.xls diff --git a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy03.xls b/org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy03.xls similarity index 100% rename from org.argeo.server.jcr/ext/test/org/argeo/server/jcr/dummy03.xls rename to org.argeo.jcr/ext/test/org/argeo/server/jcr/dummy03.xls diff --git a/org.argeo.server.jcr/pom.xml b/org.argeo.jcr/pom.xml similarity index 92% rename from org.argeo.server.jcr/pom.xml rename to org.argeo.jcr/pom.xml index af01e0097..0abd44cec 100644 --- a/org.argeo.server.jcr/pom.xml +++ b/org.argeo.jcr/pom.xml @@ -6,7 +6,7 @@ 2.1.46-SNAPSHOT .. - org.argeo.server.jcr + org.argeo.jcr Commons JCR diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitAdminLoginModule.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitContainer.java b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitContainer.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitContainer.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitContainer.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitDataModelMigration.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java b/org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/JackrabbitWrapper.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-h2.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/repository-h2.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-h2.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/repository-h2.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-localfs.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/repository-localfs.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-localfs.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/repository-localfs.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-memory.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/repository-memory.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-memory.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/repository-memory.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql-ds.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/repository-postgresql.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java b/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java b/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java b/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java b/org.argeo.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java rename to org.argeo.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/jaas.config b/org.argeo.jcr/src/org/argeo/jackrabbit/unit/jaas.config similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/jaas.config rename to org.argeo.jcr/src/org/argeo/jackrabbit/unit/jaas.config diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml b/org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml rename to org.argeo.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ArgeoJcrConstants.java b/org.argeo.jcr/src/org/argeo/jcr/ArgeoJcrConstants.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/ArgeoJcrConstants.java rename to org.argeo.jcr/src/org/argeo/jcr/ArgeoJcrConstants.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ArgeoJcrException.java b/org.argeo.jcr/src/org/argeo/jcr/ArgeoJcrException.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/ArgeoJcrException.java rename to org.argeo.jcr/src/org/argeo/jcr/ArgeoJcrException.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ArgeoJcrUtils.java b/org.argeo.jcr/src/org/argeo/jcr/ArgeoJcrUtils.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/ArgeoJcrUtils.java rename to org.argeo.jcr/src/org/argeo/jcr/ArgeoJcrUtils.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ArgeoNames.java b/org.argeo.jcr/src/org/argeo/jcr/ArgeoNames.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/ArgeoNames.java rename to org.argeo.jcr/src/org/argeo/jcr/ArgeoNames.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ArgeoTypes.java b/org.argeo.jcr/src/org/argeo/jcr/ArgeoTypes.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/ArgeoTypes.java rename to org.argeo.jcr/src/org/argeo/jcr/ArgeoTypes.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/CollectionNodeIterator.java b/org.argeo.jcr/src/org/argeo/jcr/CollectionNodeIterator.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/CollectionNodeIterator.java rename to org.argeo.jcr/src/org/argeo/jcr/CollectionNodeIterator.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/DefaultJcrListener.java b/org.argeo.jcr/src/org/argeo/jcr/DefaultJcrListener.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/DefaultJcrListener.java rename to org.argeo.jcr/src/org/argeo/jcr/DefaultJcrListener.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/DefaultRepositoryFactory.java b/org.argeo.jcr/src/org/argeo/jcr/DefaultRepositoryFactory.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/DefaultRepositoryFactory.java rename to org.argeo.jcr/src/org/argeo/jcr/DefaultRepositoryFactory.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/DefaultRepositoryRegister.java b/org.argeo.jcr/src/org/argeo/jcr/DefaultRepositoryRegister.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/DefaultRepositoryRegister.java rename to org.argeo.jcr/src/org/argeo/jcr/DefaultRepositoryRegister.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/JcrCallback.java b/org.argeo.jcr/src/org/argeo/jcr/JcrCallback.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/JcrCallback.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrCallback.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/JcrMonitor.java b/org.argeo.jcr/src/org/argeo/jcr/JcrMonitor.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/JcrMonitor.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrMonitor.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java b/org.argeo.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrRepositoryWrapper.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/JcrResourceAdapter.java b/org.argeo.jcr/src/org/argeo/jcr/JcrResourceAdapter.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/JcrResourceAdapter.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrResourceAdapter.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java b/org.argeo.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrUrlStreamHandler.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/JcrUtils.java b/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/JcrUtils.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/PropertyDiff.java b/org.argeo.jcr/src/org/argeo/jcr/PropertyDiff.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/PropertyDiff.java rename to org.argeo.jcr/src/org/argeo/jcr/PropertyDiff.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/RepositoryRegister.java b/org.argeo.jcr/src/org/argeo/jcr/RepositoryRegister.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/RepositoryRegister.java rename to org.argeo.jcr/src/org/argeo/jcr/RepositoryRegister.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/org.argeo.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java rename to org.argeo.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/UserJcrUtils.java b/org.argeo.jcr/src/org/argeo/jcr/UserJcrUtils.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/UserJcrUtils.java rename to org.argeo.jcr/src/org/argeo/jcr/UserJcrUtils.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/VersionDiff.java b/org.argeo.jcr/src/org/argeo/jcr/VersionDiff.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/VersionDiff.java rename to org.argeo.jcr/src/org/argeo/jcr/VersionDiff.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/argeo.cnd b/org.argeo.jcr/src/org/argeo/jcr/argeo.cnd similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/argeo.cnd rename to org.argeo.jcr/src/org/argeo/jcr/argeo.cnd diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/docbook/DocBookModel.java b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/docbook/DocBookModel.java rename to org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookModel.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/docbook/DocBookNames.java b/org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/docbook/DocBookNames.java rename to org.argeo.jcr/src/org/argeo/jcr/docbook/DocBookNames.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd b/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd rename to org.argeo.jcr/src/org/argeo/jcr/docbook/docbook-full.cnd diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/docbook/docbook.cnd b/org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/docbook/docbook.cnd rename to org.argeo.jcr/src/org/argeo/jcr/docbook/docbook.cnd diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFileStore.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileStore.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFileStore.java rename to org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileStore.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java rename to org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystem.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java rename to org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFsException.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFsException.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrFsException.java rename to org.argeo.jcr/src/org/argeo/jcr/fs/JcrFsException.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrPath.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/fs/JcrPath.java rename to org.argeo.jcr/src/org/argeo/jcr/fs/JcrPath.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java b/org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java rename to org.argeo.jcr/src/org/argeo/jcr/proxy/AbstractUrlProxy.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java b/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java rename to org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxy.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java b/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java rename to org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java b/org.argeo.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java rename to org.argeo.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/security/JcrKeyring.java b/org.argeo.jcr/src/org/argeo/jcr/security/JcrKeyring.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/security/JcrKeyring.java rename to org.argeo.jcr/src/org/argeo/jcr/security/JcrKeyring.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java b/org.argeo.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java rename to org.argeo.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/tabular/JcrTabularRowIterator.java b/org.argeo.jcr/src/org/argeo/jcr/tabular/JcrTabularRowIterator.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/tabular/JcrTabularRowIterator.java rename to org.argeo.jcr/src/org/argeo/jcr/tabular/JcrTabularRowIterator.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/tabular/JcrTabularWriter.java b/org.argeo.jcr/src/org/argeo/jcr/tabular/JcrTabularWriter.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/tabular/JcrTabularWriter.java rename to org.argeo.jcr/src/org/argeo/jcr/tabular/JcrTabularWriter.java diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java b/org.argeo.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java similarity index 100% rename from org.argeo.server.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java rename to org.argeo.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java diff --git a/org.argeo.cms.api/.classpath b/org.argeo.node.api/.classpath similarity index 100% rename from org.argeo.cms.api/.classpath rename to org.argeo.node.api/.classpath diff --git a/org.argeo.security.core/.project b/org.argeo.node.api/.project similarity index 94% rename from org.argeo.security.core/.project rename to org.argeo.node.api/.project index a8e385a9c..9573f0c01 100644 --- a/org.argeo.security.core/.project +++ b/org.argeo.node.api/.project @@ -1,6 +1,6 @@ - org.argeo.security.core + org.argeo.node.api @@ -22,7 +22,7 @@ - org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature diff --git a/org.argeo.cms.api/bnd.bnd b/org.argeo.node.api/bnd.bnd similarity index 100% rename from org.argeo.cms.api/bnd.bnd rename to org.argeo.node.api/bnd.bnd diff --git a/org.argeo.cms.api/build.properties b/org.argeo.node.api/build.properties similarity index 100% rename from org.argeo.cms.api/build.properties rename to org.argeo.node.api/build.properties diff --git a/org.argeo.cms.api/pom.xml b/org.argeo.node.api/pom.xml similarity index 86% rename from org.argeo.cms.api/pom.xml rename to org.argeo.node.api/pom.xml index 12911e680..c52d9a489 100644 --- a/org.argeo.cms.api/pom.xml +++ b/org.argeo.node.api/pom.xml @@ -7,8 +7,8 @@ 2.1.46-SNAPSHOT .. - org.argeo.cms.api - Commons CMS API + org.argeo.node.api + Argeo Node API jar diff --git a/org.argeo.cms.api/src/org/argeo/node/ArgeoLogListener.java b/org.argeo.node.api/src/org/argeo/node/ArgeoLogListener.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/ArgeoLogListener.java rename to org.argeo.node.api/src/org/argeo/node/ArgeoLogListener.java diff --git a/org.argeo.cms.api/src/org/argeo/node/ArgeoLogger.java b/org.argeo.node.api/src/org/argeo/node/ArgeoLogger.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/ArgeoLogger.java rename to org.argeo.node.api/src/org/argeo/node/ArgeoLogger.java diff --git a/org.argeo.cms.api/src/org/argeo/node/DataAdminPrincipal.java b/org.argeo.node.api/src/org/argeo/node/DataAdminPrincipal.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/DataAdminPrincipal.java rename to org.argeo.node.api/src/org/argeo/node/DataAdminPrincipal.java diff --git a/org.argeo.cms.api/src/org/argeo/node/DataModelNamespace.java b/org.argeo.node.api/src/org/argeo/node/DataModelNamespace.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/DataModelNamespace.java rename to org.argeo.node.api/src/org/argeo/node/DataModelNamespace.java diff --git a/org.argeo.cms.api/src/org/argeo/node/EnumAD.java b/org.argeo.node.api/src/org/argeo/node/EnumAD.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/EnumAD.java rename to org.argeo.node.api/src/org/argeo/node/EnumAD.java diff --git a/org.argeo.cms.api/src/org/argeo/node/EnumOCD.java b/org.argeo.node.api/src/org/argeo/node/EnumOCD.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/EnumOCD.java rename to org.argeo.node.api/src/org/argeo/node/EnumOCD.java diff --git a/org.argeo.cms.api/src/org/argeo/node/NodeConstants.java b/org.argeo.node.api/src/org/argeo/node/NodeConstants.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/NodeConstants.java rename to org.argeo.node.api/src/org/argeo/node/NodeConstants.java diff --git a/org.argeo.cms.api/src/org/argeo/node/NodeDeployment.java b/org.argeo.node.api/src/org/argeo/node/NodeDeployment.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/NodeDeployment.java rename to org.argeo.node.api/src/org/argeo/node/NodeDeployment.java diff --git a/org.argeo.cms.api/src/org/argeo/node/NodeInstance.java b/org.argeo.node.api/src/org/argeo/node/NodeInstance.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/NodeInstance.java rename to org.argeo.node.api/src/org/argeo/node/NodeInstance.java diff --git a/org.argeo.cms.api/src/org/argeo/node/NodeOID.java b/org.argeo.node.api/src/org/argeo/node/NodeOID.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/NodeOID.java rename to org.argeo.node.api/src/org/argeo/node/NodeOID.java diff --git a/org.argeo.cms.api/src/org/argeo/node/NodeState.java b/org.argeo.node.api/src/org/argeo/node/NodeState.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/NodeState.java rename to org.argeo.node.api/src/org/argeo/node/NodeState.java diff --git a/org.argeo.cms.api/src/org/argeo/node/RepoConf.java b/org.argeo.node.api/src/org/argeo/node/RepoConf.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/RepoConf.java rename to org.argeo.node.api/src/org/argeo/node/RepoConf.java diff --git a/org.argeo.cms.api/src/org/argeo/node/node.cnd b/org.argeo.node.api/src/org/argeo/node/node.cnd similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/node.cnd rename to org.argeo.node.api/src/org/argeo/node/node.cnd diff --git a/org.argeo.cms.api/src/org/argeo/node/package-info.java b/org.argeo.node.api/src/org/argeo/node/package-info.java similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/package-info.java rename to org.argeo.node.api/src/org/argeo/node/package-info.java diff --git a/org.argeo.cms.api/src/org/argeo/node/packageinfo b/org.argeo.node.api/src/org/argeo/node/packageinfo similarity index 100% rename from org.argeo.cms.api/src/org/argeo/node/packageinfo rename to org.argeo.node.api/src/org/argeo/node/packageinfo diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java index 607f6264b..64ace0c3e 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java @@ -205,10 +205,13 @@ public class OsgiBoot implements OsgiBootConstants { warn("Skip " + url); return; } else { - Bundle bundle = bundleContext.installBundle(url); - OsgiBootUtils - .info("Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); + if (url.startsWith("http")) + OsgiBootUtils + .info("Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); + else if (debug) + OsgiBootUtils.debug( + "Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); } } catch (BundleException e) { String message = e.getMessage(); @@ -642,14 +645,14 @@ public class OsgiBoot implements OsgiBootConstants { return (basePath + '/' + relativePath).replace('/', File.separatorChar); } - private String removeFilePrefix(String url) { - if (url.startsWith("file:")) - return url.substring("file:".length()); - else if (url.startsWith("reference:file:")) - return url.substring("reference:file:".length()); - else - return url; - } + // private String removeFilePrefix(String url) { + // if (url.startsWith("file:")) + // return url.substring("file:".length()); + // else if (url.startsWith("reference:file:")) + // return url.substring("reference:file:".length()); + // else + // return url; + // } /* * BEAN METHODS diff --git a/org.argeo.security.jackrabbit/.project b/org.argeo.security.jackrabbit/.project deleted file mode 100644 index 35bcca28f..000000000 --- a/org.argeo.security.jackrabbit/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.security.jackrabbit - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml index 5672e9b93..beb37408e 100644 --- a/org.argeo.security.ui/pom.xml +++ b/org.argeo.security.ui/pom.xml @@ -8,7 +8,7 @@ .. org.argeo.security.ui - Commons CMS Workbench + CMS Workbench jar @@ -16,11 +16,11 @@ org.argeo.cms 2.1.46-SNAPSHOT - - org.argeo.commons - org.argeo.security.core - 2.1.46-SNAPSHOT - + + + + + org.argeo.commons org.argeo.eclipse.ui.workbench diff --git a/pom.xml b/pom.xml index 92be301de..3f8cc3384 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo.commons argeo-commons @@ -21,23 +22,23 @@ org.argeo.util + org.argeo.enterprise + org.argeo.jcr org.argeo.osgi.boot - org.argeo.server.jcr - - org.argeo.security.core org.argeo.eclipse.ui org.argeo.eclipse.ui.rap + org.argeo.eclipse.ui.workbench - org.argeo.cms.api + org.argeo.node.api org.argeo.cms - org.argeo.security.jackrabbit - - org.argeo.eclipse.ui.workbench - org.argeo.eclipse.ui.workbench.rap + org.argeo.security.ui - org.argeo.security.ui.admin - org.argeo.security.ui.rap + org.argeo.cms.ui.workbench + org.argeo.cms.ui.workbench.rap + + org.argeo.ext.jackrabbit + org.argeo.ext.rap.ui.workbench dep dist @@ -502,8 +503,10 @@ limitations under the License. - - + + @@ -528,8 +531,10 @@ limitations under the License. - - + + -- 2.30.2