From 5b3108fe285bca50565b58b63fa4feddc96c0765 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 12 Mar 2020 09:48:40 +0100 Subject: [PATCH] Rename packages in order to make future stable documentation clearer. --- dep/org.argeo.dep.cms.node/pom.xml | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 {org.argeo.node.api => org.argeo.api}/bnd.bnd | 0 .../build.properties | 0 {org.argeo.node.api => org.argeo.api}/pom.xml | 2 +- .../src/org/argeo/api}/ArgeoLogListener.java | 2 +- .../src/org/argeo/api}/ArgeoLogger.java | 2 +- .../org/argeo/api}/DataAdminLoginModule.java | 4 +- .../org/argeo/api}/DataModelNamespace.java | 2 +- .../src/org/argeo/api}/MvcProvider.java | 2 +- .../src/org/argeo/api}/NodeConstants.java | 16 +-- .../src/org/argeo/api}/NodeDeployment.java | 2 +- .../src/org/argeo/api}/NodeInstance.java | 2 +- .../src/org/argeo/api}/NodeNames.java | 2 +- .../src/org/argeo/api}/NodeOID.java | 2 +- .../src/org/argeo/api}/NodeState.java | 2 +- .../src/org/argeo/api}/NodeTypes.java | 2 +- .../src/org/argeo/api}/NodeUtils.java | 2 +- .../src/org/argeo/api}/ldap.cnd | 0 .../src/org/argeo/api}/node.cnd | 0 .../src/org/argeo/api}/package-info.java | 2 +- .../api}/security/AnonymousPrincipal.java | 4 +- .../argeo/api}/security/CryptoKeyring.java | 2 +- .../api}/security/DataAdminPrincipal.java | 4 +- .../src/org/argeo/api}/security/Keyring.java | 2 +- .../api}/security/NodeSecurityUtils.java | 4 +- .../api}/security/PBEKeySpecCallback.java | 2 +- .../argeo/api}/tabular/ArrayTabularRow.java | 2 +- .../org/argeo/api}/tabular/TabularColumn.java | 2 +- .../argeo/api}/tabular/TabularContent.java | 2 +- .../org/argeo/api}/tabular/TabularRow.java | 2 +- .../api}/tabular/TabularRowIterator.java | 2 +- .../org/argeo/api}/tabular/TabularWriter.java | 2 +- .../OSGI-INF/cms-demo-rap.xml | 8 -- org.argeo.cms.e4.rap/bnd.bnd | 5 +- org.argeo.cms.e4.rap/cms/app.js | 12 -- .../org/argeo/cms/e4/rap/CmsE4DemoApp.java | 10 -- .../argeo/cms/e4/rap/CmsLoginLifecycle.java | 8 +- .../e4/rap/parts/CkEditor-removeButtons.js | 1 - .../cms/e4/rap/parts/CkEditor-toolbar.js | 19 --- .../e4/rap/parts/CkEditor-toolbarGroups.json | 92 ------------- .../argeo/cms/e4/rap/parts/HtmlEditor.java | 127 ------------------ .../src/org/argeo/cms/e4/rap/parts/test.json | 28 ---- .../OSGI-INF/defaultCallbackHandler.xml | 2 +- org.argeo.cms.e4/OSGI-INF/homeRepository.xml | 2 +- org.argeo.cms.e4/bnd.bnd | 2 +- .../OsgiFilterContextFunction.java | 4 +- .../argeo/cms/e4/files/NodeFsBrowserView.java | 2 +- .../argeo/cms/e4/handlers/ChangePassword.java | 2 +- .../org/argeo/cms/e4/jcr/JcrBrowserView.java | 14 +- .../e4/jcr/handlers/AddRemoteRepository.java | 6 +- .../maintenance/AbstractOsgiComposite.java | 8 +- .../org/argeo/cms/e4}/maintenance/Browse.java | 45 +++---- .../maintenance/ConnectivityDeploymentUi.java | 6 +- .../cms/e4}/maintenance/DataDeploymentUi.java | 8 +- .../e4}/maintenance/DeploymentEntryPoint.java | 19 ++- .../cms/e4}/maintenance/LogDeploymentUi.java | 7 +- .../e4}/maintenance/MaintenanceStyles.java | 2 +- .../cms/e4}/maintenance/NonAdminPage.java | 6 +- .../e4}/maintenance/SecurityDeploymentUi.java | 6 +- .../cms/e4/users/AbstractRoleEditor.java | 4 +- .../org/argeo/cms/e4/users/GroupEditor.java | 18 +-- .../org/argeo/cms/e4/users/GroupsView.java | 2 +- .../argeo/cms/e4/users/UserAdminWrapper.java | 2 +- .../cms/e4/users/UserBatchUpdateWizard.java | 2 +- .../org/argeo/cms/e4/users/UserEditor.java | 10 +- .../src/org/argeo/cms/e4/users/UsersView.java | 2 +- .../cms/e4/users/providers/RoleIconLP.java | 4 +- .../cms/e4/users/providers/UserFilter.java | 2 +- .../argeo/cms/maintenance/MaintenanceUi.java | 14 -- .../argeo/cms/ui/AbstractCmsEntryPoint.java | 2 +- .../src/org/argeo/cms/ui/CmsUiProvider.java | 2 +- .../cms/ui/dialogs/CmsMessageDialog.java | 4 +- .../argeo/cms/ui/dialogs/CmsWizardDialog.java | 6 +- .../cms/{ => ui}/forms/EditableLink.java | 4 +- .../forms/EditableMultiStringProperty.java | 22 +-- .../{ => ui}/forms/EditablePropertyDate.java | 24 ++-- .../forms/EditablePropertyString.java | 10 +- .../cms/{ => ui}/forms/FormConstants.java | 2 +- .../cms/{ => ui}/forms/FormEditorHeader.java | 10 +- .../cms/{ => ui}/forms/FormPageViewer.java | 46 +++---- .../argeo/cms/{ => ui}/forms/FormStyle.java | 2 +- .../argeo/cms/{ => ui}/forms/FormUtils.java | 6 +- .../{ => ui}/forms/MarkupValidatorCopy.java | 2 +- .../src/org/argeo/cms/ui/fs/CmsFsBrowser.java | 8 +- .../org/argeo/cms/ui/fs/FsContextMenu.java | 8 +- .../src/org/argeo/cms/ui/img/Dummy.java | 5 - .../org/argeo/cms/ui/internal/Activator.java | 2 +- .../cms/ui/internal/SimpleEditableImage.java | 10 +- .../org/argeo/cms/ui/internal/rwt/UserUi.java | 2 +- .../cms/ui/jcr/DefaultRepositoryRegister.java | 2 +- .../cms/ui/jcr/JcrTreeContentProvider.java | 2 +- .../argeo/cms/ui/jcr/NodeContentProvider.java | 6 +- .../cms/ui/jcr/PropertiesContentProvider.java | 2 +- .../ui/jcr/model/RemoteRepositoryElem.java | 4 +- .../cms/ui/jcr/model/RepositoriesElem.java | 4 +- .../org/argeo/cms/{ => ui}/script/AppUi.java | 16 +-- .../argeo/cms/{ => ui}/script/Branding.java | 2 +- .../cms/{ => ui}/script/CmsScriptApp.java | 10 +- .../script/CmsScriptRwtApplication.java | 2 +- .../{ => ui}/script/ScriptAppActivator.java | 2 +- .../argeo/cms/{ => ui}/script/ScriptUi.java | 2 +- .../org/argeo/cms/{ => ui}/script/Theme.java | 4 +- .../src/org/argeo/cms/{ => ui}/script/cms.js | 20 +-- .../cms/ui/useradmin/PickUpUserDialog.java | 2 +- .../org/argeo/cms/ui/useradmin/UserLP.java | 2 +- .../{ => ui}/util/BundleResourceLoader.java | 2 +- .../org/argeo/cms/{ => ui}/util/CmsLink.java | 6 +- .../org/argeo/cms/{ => ui}/util/CmsPane.java | 4 +- .../org/argeo/cms/{ => ui}/util/CmsTheme.java | 2 +- .../CmsUtils.java => ui/util/CmsUiUtils.java} | 14 +- .../{ => ui}/util/DefaultImageManager.java | 12 +- .../cms/{ => ui}/util/LoginEntryPoint.java | 8 +- .../org/argeo/cms/{ => ui}/util/MenuLink.java | 2 +- .../argeo/cms/{ => ui}/util/SimpleApp.java | 8 +- .../cms/{ => ui}/util/SimpleCmsHeader.java | 6 +- .../cms/{ => ui}/util/SimpleDynamicPages.java | 2 +- .../cms/{ => ui}/util/SimpleErgonomics.java | 14 +- .../cms/{ => ui}/util/SimpleImageManager.java | 2 +- .../cms/{ => ui}/util/SimpleStaticPage.java | 2 +- .../cms/{ => ui}/util/SimpleUxContext.java | 2 +- .../util/StyleSheetResourceLoader.java | 2 +- .../{ => ui}/util/SystemNotifications.java | 4 +- .../argeo/cms/{ => ui}/util/ThemeUtils.java | 2 +- .../org/argeo/cms/{ => ui}/util/UserMenu.java | 6 +- .../argeo/cms/{ => ui}/util/UserMenuLink.java | 4 +- .../argeo/cms/{ => ui}/util/VerticalMenu.java | 4 +- .../{ => ui}/viewers/AbstractPageViewer.java | 4 +- .../cms/{ => ui}/viewers/EditablePart.java | 2 +- .../argeo/cms/{ => ui}/viewers/ItemPart.java | 2 +- .../viewers/JcrVersionCmsEditable.java | 2 +- .../argeo/cms/{ => ui}/viewers/NodePart.java | 2 +- .../cms/{ => ui}/viewers/PropertyPart.java | 2 +- .../argeo/cms/{ => ui}/viewers/Section.java | 12 +- .../cms/{ => ui}/viewers/SectionPart.java | 2 +- .../cms/{ => ui}/widgets/EditableImage.java | 18 +-- .../cms/{ => ui}/widgets/EditableText.java | 14 +- .../org/argeo/cms/{ => ui}/widgets/Img.java | 18 +-- .../cms/{ => ui}/widgets/JcrComposite.java | 6 +- .../cms/{ => ui}/widgets/ScrolledPage.java | 2 +- .../cms/{ => ui}/widgets/StyledControl.java | 12 +- .../cms/{ => ui}/widgets/TextStyles.java | 2 +- .../widgets/auth/AbstractLoginDialog.java | 2 +- .../cms/{ => ui}/widgets/auth/CmsLogin.java | 40 +++--- .../{ => ui}/widgets/auth/CmsLoginShell.java | 6 +- .../auth/CompositeCallbackHandler.java | 2 +- .../widgets/auth/DefaultLoginDialog.java | 2 +- .../widgets/auth/DynamicCallbackHandler.java | 2 +- .../{ => ui}/widgets/auth/LocaleChoice.java | 2 +- .../org/argeo/cms/tabular/JcrTabularTest.java | 10 +- org.argeo.cms/pom.xml | 2 +- .../src/org/argeo/cms/auth/CmsAuthUtils.java | 8 +- .../src/org/argeo/cms/auth/CurrentUser.java | 2 +- .../argeo/cms/auth/KeyringLoginModule.java | 2 +- .../argeo/cms/auth/SingleUserLoginModule.java | 4 +- .../argeo/cms/auth/UserAdminLoginModule.java | 4 +- .../org/argeo/cms/auth/UserAdminUtils.java | 2 +- .../cms/i18n/DefaultsResourceBundle.java | 42 ------ .../src/org/argeo/cms/i18n/LocaleUtils.java | 54 -------- .../src/org/argeo/cms/i18n/Localized.java | 10 -- .../cms/integration/CmsLoginServlet.java | 2 +- .../cms/integration/CmsLogoutServlet.java | 2 +- .../integration/CmsPrivateServletContext.java | 2 +- .../cms/integration/CmsTokenServlet.java | 2 +- .../cms/internal/auth/CmsSessionImpl.java | 4 +- .../cms/internal/auth/CmsUserManagerImpl.java | 2 +- .../cms/internal/http/DataHttpContext.java | 2 +- .../argeo/cms/internal/http/LinkServlet.java | 4 +- .../cms/internal/jcr/RepositoryBuilder.java | 2 +- .../argeo/cms/internal/kernel/Activator.java | 10 +- .../cms/internal/kernel/CmsDeployment.java | 14 +- .../cms/internal/kernel/CmsFsProvider.java | 4 +- .../cms/internal/kernel/CmsInstance.java | 4 +- .../argeo/cms/internal/kernel/CmsState.java | 4 +- .../argeo/cms/internal/kernel/DataModels.java | 4 +- .../cms/internal/kernel/DeployConfig.java | 2 +- .../cms/internal/kernel/EgoRepository.java | 4 +- .../argeo/cms/internal/kernel/InitUtils.java | 2 +- .../kernel/JackrabbitLocalRepository.java | 2 +- .../cms/internal/kernel/KernelConstants.java | 2 +- .../cms/internal/kernel/KernelUtils.java | 4 +- .../cms/internal/kernel/LocalRepository.java | 2 +- .../argeo/cms/internal/kernel/NodeHttp.java | 2 +- .../argeo/cms/internal/kernel/NodeLogger.java | 6 +- .../kernel/NodeRepositoryFactory.java | 2 +- .../cms/internal/kernel/NodeUserAdmin.java | 2 +- .../kernel/RepositoryServiceFactory.java | 2 +- .../cms/internal/kernel/SecurityProfile.java | 2 +- .../argeo/cms/internal/kernel/jaas-ipa.cfg | 4 +- .../org/argeo/cms/internal/kernel/jaas.cfg | 4 +- .../argeo/cms/security/AbstractKeyring.java | 8 +- .../org/argeo/cms/security/JcrKeyring.java | 6 +- .../argeo/cms/tabular/CsvTabularWriter.java | 2 +- .../cms/tabular/JcrTabularRowIterator.java | 8 +- .../argeo/cms/tabular/JcrTabularWriter.java | 4 +- .../websocket/CmsWebSocketConfigurator.java | 2 +- org.argeo.eclipse.ui.rap/bnd.bnd | 2 +- .../argeo/eclipse/ui/specific/OpenFile.java | 2 +- .../eclipse/ui/specific/OpenFileService.java | 6 +- .../jcr/{utils => util}/JcrFileProvider.java | 2 +- .../{utils => util}/JcrItemsComparator.java | 2 +- .../{utils => util}/NodeViewerComparer.java | 2 +- .../SingleSessionFileProvider.java | 2 +- .../eclipse/ui/parts/LdifUsersTable.java | 2 +- .../SingleSourcingConstants.java | 2 +- .../ui/{utils => util}/ViewerUtils.java | 2 +- org.argeo.ext.equinox.jetty/bnd.bnd | 2 +- org.argeo.ext.jackrabbit/bnd.bnd | 2 +- org.argeo.ext.jackrabbit/pom.xml | 2 +- .../jackrabbit/ArgeoSecurityManager.java | 6 +- .../SystemJackrabbitLoginModule.java | 4 +- org.argeo.maintenance/pom.xml | 2 +- .../AbstractMaintenanceService.java | 2 +- .../maintenance/backup/LogicalBackup.java | 2 +- .../src/org/argeo/util/{test => }/Tester.java | 2 +- .../argeo/util/{test => }/TesterStatus.java | 2 +- pom.xml | 4 +- 220 files changed, 506 insertions(+), 936 deletions(-) rename {org.argeo.node.api => org.argeo.api}/.classpath (100%) rename {org.argeo.node.api => org.argeo.api}/.gitignore (100%) rename {org.argeo.node.api => org.argeo.api}/.project (94%) rename {org.argeo.node.api => org.argeo.api}/META-INF/.gitignore (100%) rename {org.argeo.node.api => org.argeo.api}/bnd.bnd (100%) rename {org.argeo.node.api => org.argeo.api}/build.properties (100%) rename {org.argeo.node.api => org.argeo.api}/pom.xml (90%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/ArgeoLogListener.java (98%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/ArgeoLogger.java (98%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/DataAdminLoginModule.java (93%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/DataModelNamespace.java (95%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/MvcProvider.java (97%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeConstants.java (87%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeDeployment.java (72%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeInstance.java (93%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeNames.java (97%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeOID.java (88%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeState.java (89%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeTypes.java (97%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/NodeUtils.java (99%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/ldap.cnd (100%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/node.cnd (100%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/package-info.java (81%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/security/AnonymousPrincipal.java (89%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/security/CryptoKeyring.java (96%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/security/DataAdminPrincipal.java (87%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/security/Keyring.java (97%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/security/NodeSecurityUtils.java (95%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/security/PBEKeySpecCallback.java (98%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/tabular/ArrayTabularRow.java (96%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/tabular/TabularColumn.java (97%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/tabular/TabularContent.java (96%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/tabular/TabularRow.java (96%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/tabular/TabularRowIterator.java (96%) rename {org.argeo.node.api/src/org/argeo/node => org.argeo.api/src/org/argeo/api}/tabular/TabularWriter.java (96%) delete mode 100644 org.argeo.cms.e4.rap/OSGI-INF/cms-demo-rap.xml delete mode 100644 org.argeo.cms.e4.rap/cms/app.js delete mode 100644 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java delete mode 100644 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-removeButtons.js delete mode 100644 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbar.js delete mode 100644 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbarGroups.json delete mode 100644 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java delete mode 100644 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/test.json rename org.argeo.cms.e4/src/org/argeo/cms/e4/{contexts => }/OsgiFilterContextFunction.java (91%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/AbstractOsgiComposite.java (88%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/Browse.java (93%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/ConnectivityDeploymentUi.java (93%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/DataDeploymentUi.java (97%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/DeploymentEntryPoint.java (88%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/LogDeploymentUi.java (94%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/MaintenanceStyles.java (86%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/NonAdminPage.java (87%) rename {org.argeo.cms.ui/src/org/argeo/cms => org.argeo.cms.e4/src/org/argeo/cms/e4}/maintenance/SecurityDeploymentUi.java (95%) delete mode 100644 org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceUi.java rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/EditableLink.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/EditableMultiStringProperty.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/EditablePropertyDate.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/EditablePropertyString.java (89%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/FormConstants.java (82%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/FormEditorHeader.java (92%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/FormPageViewer.java (94%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/FormStyle.java (95%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/FormUtils.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/forms/MarkupValidatorCopy.java (99%) delete mode 100644 org.argeo.cms.ui/src/org/argeo/cms/ui/img/Dummy.java rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/AppUi.java (95%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/Branding.java (90%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/CmsScriptApp.java (97%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/CmsScriptRwtApplication.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/ScriptAppActivator.java (97%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/ScriptUi.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/Theme.java (82%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/script/cms.js (77%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/BundleResourceLoader.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/CmsLink.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/CmsPane.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/CmsTheme.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{util/CmsUtils.java => ui/util/CmsUiUtils.java} (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/DefaultImageManager.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/LoginEntryPoint.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/MenuLink.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleApp.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleCmsHeader.java (92%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleDynamicPages.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleErgonomics.java (94%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleImageManager.java (68%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleStaticPage.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SimpleUxContext.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/StyleSheetResourceLoader.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/SystemNotifications.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/ThemeUtils.java (97%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/UserMenu.java (91%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/UserMenuLink.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/util/VerticalMenu.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/AbstractPageViewer.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/EditablePart.java (82%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/ItemPart.java (85%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/JcrVersionCmsEditable.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/NodePart.java (80%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/PropertyPart.java (83%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/Section.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/viewers/SectionPart.java (84%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/EditableImage.java (87%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/EditableText.java (87%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/Img.java (90%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/JcrComposite.java (97%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/ScrolledPage.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/StyledControl.java (93%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/TextStyles.java (97%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/AbstractLoginDialog.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/CmsLogin.java (91%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/CmsLoginShell.java (91%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/CompositeCallbackHandler.java (99%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/DefaultLoginDialog.java (98%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/DynamicCallbackHandler.java (96%) rename org.argeo.cms.ui/src/org/argeo/cms/{ => ui}/widgets/auth/LocaleChoice.java (98%) delete mode 100644 org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/i18n/Localized.java rename org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/{utils => util}/JcrFileProvider.java (99%) rename org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/{utils => util}/JcrItemsComparator.java (96%) rename org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/{utils => util}/NodeViewerComparer.java (97%) rename org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/{utils => util}/SingleSessionFileProvider.java (98%) rename org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/{utils => util}/SingleSourcingConstants.java (92%) rename org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/{utils => util}/ViewerUtils.java (98%) rename org.argeo.util/src/org/argeo/util/{test => }/Tester.java (99%) rename org.argeo.util/src/org/argeo/util/{test => }/TesterStatus.java (98%) diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index 7d6eb4310..b202c69fe 100644 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@ -22,7 +22,7 @@ org.argeo.commons - org.argeo.node.api + org.argeo.api 2.1.88-SNAPSHOT diff --git a/org.argeo.node.api/.classpath b/org.argeo.api/.classpath similarity index 100% rename from org.argeo.node.api/.classpath rename to org.argeo.api/.classpath diff --git a/org.argeo.node.api/.gitignore b/org.argeo.api/.gitignore similarity index 100% rename from org.argeo.node.api/.gitignore rename to org.argeo.api/.gitignore diff --git a/org.argeo.node.api/.project b/org.argeo.api/.project similarity index 94% rename from org.argeo.node.api/.project rename to org.argeo.api/.project index 9573f0c01..a396aadc8 100644 --- a/org.argeo.node.api/.project +++ b/org.argeo.api/.project @@ -1,6 +1,6 @@ - org.argeo.node.api + org.argeo.api diff --git a/org.argeo.node.api/META-INF/.gitignore b/org.argeo.api/META-INF/.gitignore similarity index 100% rename from org.argeo.node.api/META-INF/.gitignore rename to org.argeo.api/META-INF/.gitignore diff --git a/org.argeo.node.api/bnd.bnd b/org.argeo.api/bnd.bnd similarity index 100% rename from org.argeo.node.api/bnd.bnd rename to org.argeo.api/bnd.bnd diff --git a/org.argeo.node.api/build.properties b/org.argeo.api/build.properties similarity index 100% rename from org.argeo.node.api/build.properties rename to org.argeo.api/build.properties diff --git a/org.argeo.node.api/pom.xml b/org.argeo.api/pom.xml similarity index 90% rename from org.argeo.node.api/pom.xml rename to org.argeo.api/pom.xml index c148f2a13..74987c761 100644 --- a/org.argeo.node.api/pom.xml +++ b/org.argeo.api/pom.xml @@ -7,7 +7,7 @@ 2.1.88-SNAPSHOT .. - org.argeo.node.api + org.argeo.api Argeo Node API jar diff --git a/org.argeo.node.api/src/org/argeo/node/ArgeoLogListener.java b/org.argeo.api/src/org/argeo/api/ArgeoLogListener.java similarity index 98% rename from org.argeo.node.api/src/org/argeo/node/ArgeoLogListener.java rename to org.argeo.api/src/org/argeo/api/ArgeoLogListener.java index 303bbef7e..925c9b012 100644 --- a/org.argeo.node.api/src/org/argeo/node/ArgeoLogListener.java +++ b/org.argeo.api/src/org/argeo/api/ArgeoLogListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node; +package org.argeo.api; /** Framework agnostic interface for log notifications */ public interface ArgeoLogListener { diff --git a/org.argeo.node.api/src/org/argeo/node/ArgeoLogger.java b/org.argeo.api/src/org/argeo/api/ArgeoLogger.java similarity index 98% rename from org.argeo.node.api/src/org/argeo/node/ArgeoLogger.java rename to org.argeo.api/src/org/argeo/api/ArgeoLogger.java index 213286d44..eed02ac7f 100644 --- a/org.argeo.node.api/src/org/argeo/node/ArgeoLogger.java +++ b/org.argeo.api/src/org/argeo/api/ArgeoLogger.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node; +package org.argeo.api; /** * Logging framework agnostic identifying a logging service, to which one can diff --git a/org.argeo.node.api/src/org/argeo/node/DataAdminLoginModule.java b/org.argeo.api/src/org/argeo/api/DataAdminLoginModule.java similarity index 93% rename from org.argeo.node.api/src/org/argeo/node/DataAdminLoginModule.java rename to org.argeo.api/src/org/argeo/api/DataAdminLoginModule.java index 307474821..295196ad4 100644 --- a/org.argeo.node.api/src/org/argeo/node/DataAdminLoginModule.java +++ b/org.argeo.api/src/org/argeo/api/DataAdminLoginModule.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; import java.util.Map; @@ -8,7 +8,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.argeo.node.security.DataAdminPrincipal; +import org.argeo.api.security.DataAdminPrincipal; /** * Log-in a system process as data admin. Protection is via diff --git a/org.argeo.node.api/src/org/argeo/node/DataModelNamespace.java b/org.argeo.api/src/org/argeo/api/DataModelNamespace.java similarity index 95% rename from org.argeo.node.api/src/org/argeo/node/DataModelNamespace.java rename to org.argeo.api/src/org/argeo/api/DataModelNamespace.java index 58e4a645a..421b11a4a 100644 --- a/org.argeo.node.api/src/org/argeo/node/DataModelNamespace.java +++ b/org.argeo.api/src/org/argeo/api/DataModelNamespace.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; import org.osgi.resource.Namespace; diff --git a/org.argeo.node.api/src/org/argeo/node/MvcProvider.java b/org.argeo.api/src/org/argeo/api/MvcProvider.java similarity index 97% rename from org.argeo.node.api/src/org/argeo/node/MvcProvider.java rename to org.argeo.api/src/org/argeo/api/MvcProvider.java index 4c52b2070..9c5c4a06b 100644 --- a/org.argeo.node.api/src/org/argeo/node/MvcProvider.java +++ b/org.argeo.api/src/org/argeo/api/MvcProvider.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; import java.util.function.BiFunction; diff --git a/org.argeo.node.api/src/org/argeo/node/NodeConstants.java b/org.argeo.api/src/org/argeo/api/NodeConstants.java similarity index 87% rename from org.argeo.node.api/src/org/argeo/node/NodeConstants.java rename to org.argeo.api/src/org/argeo/api/NodeConstants.java index c639c7584..d2dfb83fd 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeConstants.java +++ b/org.argeo.api/src/org/argeo/api/NodeConstants.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; public interface NodeConstants { /* @@ -114,16 +114,16 @@ public interface NodeConstants { /* * PIDs */ - String NODE_STATE_PID = "org.argeo.node.state"; - String NODE_DEPLOYMENT_PID = "org.argeo.node.deployment"; - String NODE_INSTANCE_PID = "org.argeo.node.instance"; + String NODE_STATE_PID = "org.argeo.api.state"; + String NODE_DEPLOYMENT_PID = "org.argeo.api.deployment"; + String NODE_INSTANCE_PID = "org.argeo.api.instance"; - String NODE_KEYRING_PID = "org.argeo.node.keyring"; - String NODE_FS_PROVIDER_PID = "org.argeo.node.fsProvider"; + String NODE_KEYRING_PID = "org.argeo.api.keyring"; + String NODE_FS_PROVIDER_PID = "org.argeo.api.fsProvider"; /* * FACTORY PIDs */ - String NODE_REPOS_FACTORY_PID = "org.argeo.node.repos"; - String NODE_USER_ADMIN_PID = "org.argeo.node.userAdmin"; + String NODE_REPOS_FACTORY_PID = "org.argeo.api.repos"; + String NODE_USER_ADMIN_PID = "org.argeo.api.userAdmin"; } diff --git a/org.argeo.node.api/src/org/argeo/node/NodeDeployment.java b/org.argeo.api/src/org/argeo/api/NodeDeployment.java similarity index 72% rename from org.argeo.node.api/src/org/argeo/node/NodeDeployment.java rename to org.argeo.api/src/org/argeo/api/NodeDeployment.java index 8e5558d60..224d244dc 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeDeployment.java +++ b/org.argeo.api/src/org/argeo/api/NodeDeployment.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; public interface NodeDeployment { Long getAvailableSince(); diff --git a/org.argeo.node.api/src/org/argeo/node/NodeInstance.java b/org.argeo.api/src/org/argeo/api/NodeInstance.java similarity index 93% rename from org.argeo.node.api/src/org/argeo/node/NodeInstance.java rename to org.argeo.api/src/org/argeo/api/NodeInstance.java index aa1b5cee3..167ba81d5 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeInstance.java +++ b/org.argeo.api/src/org/argeo/api/NodeInstance.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; import javax.naming.ldap.LdapName; diff --git a/org.argeo.node.api/src/org/argeo/node/NodeNames.java b/org.argeo.api/src/org/argeo/api/NodeNames.java similarity index 97% rename from org.argeo.node.api/src/org/argeo/node/NodeNames.java rename to org.argeo.api/src/org/argeo/api/NodeNames.java index 7ded1115d..e44f08bf1 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeNames.java +++ b/org.argeo.api/src/org/argeo/api/NodeNames.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node; +package org.argeo.api; /** JCR types in the http://www.argeo.org/node namespace */ @Deprecated diff --git a/org.argeo.node.api/src/org/argeo/node/NodeOID.java b/org.argeo.api/src/org/argeo/api/NodeOID.java similarity index 88% rename from org.argeo.node.api/src/org/argeo/node/NodeOID.java rename to org.argeo.api/src/org/argeo/api/NodeOID.java index 387d511d2..ade116342 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeOID.java +++ b/org.argeo.api/src/org/argeo/api/NodeOID.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; interface NodeOID { String BASE = "1.3.6.1.4.1" + ".48308" + ".1"; diff --git a/org.argeo.node.api/src/org/argeo/node/NodeState.java b/org.argeo.api/src/org/argeo/api/NodeState.java similarity index 89% rename from org.argeo.node.api/src/org/argeo/node/NodeState.java rename to org.argeo.api/src/org/argeo/api/NodeState.java index d7148c68f..30de09587 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeState.java +++ b/org.argeo.api/src/org/argeo/api/NodeState.java @@ -1,4 +1,4 @@ -package org.argeo.node; +package org.argeo.api; import java.util.List; import java.util.Locale; diff --git a/org.argeo.node.api/src/org/argeo/node/NodeTypes.java b/org.argeo.api/src/org/argeo/api/NodeTypes.java similarity index 97% rename from org.argeo.node.api/src/org/argeo/node/NodeTypes.java rename to org.argeo.api/src/org/argeo/api/NodeTypes.java index 891f54659..b408664b7 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeTypes.java +++ b/org.argeo.api/src/org/argeo/api/NodeTypes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node; +package org.argeo.api; /** JCR types in the http://www.argeo.org/node namespace */ @Deprecated diff --git a/org.argeo.node.api/src/org/argeo/node/NodeUtils.java b/org.argeo.api/src/org/argeo/api/NodeUtils.java similarity index 99% rename from org.argeo.node.api/src/org/argeo/node/NodeUtils.java rename to org.argeo.api/src/org/argeo/api/NodeUtils.java index a735e181f..f64cbe6f7 100644 --- a/org.argeo.node.api/src/org/argeo/node/NodeUtils.java +++ b/org.argeo.api/src/org/argeo/api/NodeUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node; +package org.argeo.api; import java.security.PrivilegedAction; import java.util.HashMap; diff --git a/org.argeo.node.api/src/org/argeo/node/ldap.cnd b/org.argeo.api/src/org/argeo/api/ldap.cnd similarity index 100% rename from org.argeo.node.api/src/org/argeo/node/ldap.cnd rename to org.argeo.api/src/org/argeo/api/ldap.cnd diff --git a/org.argeo.node.api/src/org/argeo/node/node.cnd b/org.argeo.api/src/org/argeo/api/node.cnd similarity index 100% rename from org.argeo.node.api/src/org/argeo/node/node.cnd rename to org.argeo.api/src/org/argeo/api/node.cnd diff --git a/org.argeo.node.api/src/org/argeo/node/package-info.java b/org.argeo.api/src/org/argeo/api/package-info.java similarity index 81% rename from org.argeo.node.api/src/org/argeo/node/package-info.java rename to org.argeo.api/src/org/argeo/api/package-info.java index fda3baec5..1ea483a0c 100644 --- a/org.argeo.node.api/src/org/argeo/node/package-info.java +++ b/org.argeo.api/src/org/argeo/api/package-info.java @@ -2,4 +2,4 @@ * Abstractions or constants related to an Argeo Node, an active repository of * linked data. */ -package org.argeo.node; \ No newline at end of file +package org.argeo.api; \ No newline at end of file diff --git a/org.argeo.node.api/src/org/argeo/node/security/AnonymousPrincipal.java b/org.argeo.api/src/org/argeo/api/security/AnonymousPrincipal.java similarity index 89% rename from org.argeo.node.api/src/org/argeo/node/security/AnonymousPrincipal.java rename to org.argeo.api/src/org/argeo/api/security/AnonymousPrincipal.java index 141f9d1f4..d07b055ef 100644 --- a/org.argeo.node.api/src/org/argeo/node/security/AnonymousPrincipal.java +++ b/org.argeo.api/src/org/argeo/api/security/AnonymousPrincipal.java @@ -1,10 +1,10 @@ -package org.argeo.node.security; +package org.argeo.api.security; import java.security.Principal; import javax.naming.ldap.LdapName; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; /** Marker for anonymous users. */ public final class AnonymousPrincipal implements Principal { diff --git a/org.argeo.node.api/src/org/argeo/node/security/CryptoKeyring.java b/org.argeo.api/src/org/argeo/api/security/CryptoKeyring.java similarity index 96% rename from org.argeo.node.api/src/org/argeo/node/security/CryptoKeyring.java rename to org.argeo.api/src/org/argeo/api/security/CryptoKeyring.java index dd3402277..a6f37a4d6 100644 --- a/org.argeo.node.api/src/org/argeo/node/security/CryptoKeyring.java +++ b/org.argeo.api/src/org/argeo/api/security/CryptoKeyring.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.security; +package org.argeo.api.security; /** * Marker interface for an advanced keyring based on cryptography. diff --git a/org.argeo.node.api/src/org/argeo/node/security/DataAdminPrincipal.java b/org.argeo.api/src/org/argeo/api/security/DataAdminPrincipal.java similarity index 87% rename from org.argeo.node.api/src/org/argeo/node/security/DataAdminPrincipal.java rename to org.argeo.api/src/org/argeo/api/security/DataAdminPrincipal.java index 53d2cedc6..7581d8db0 100644 --- a/org.argeo.node.api/src/org/argeo/node/security/DataAdminPrincipal.java +++ b/org.argeo.api/src/org/argeo/api/security/DataAdminPrincipal.java @@ -1,8 +1,8 @@ -package org.argeo.node.security; +package org.argeo.api.security; import java.security.Principal; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; /** Allows to modify any data. */ public final class DataAdminPrincipal implements Principal { diff --git a/org.argeo.node.api/src/org/argeo/node/security/Keyring.java b/org.argeo.api/src/org/argeo/api/security/Keyring.java similarity index 97% rename from org.argeo.node.api/src/org/argeo/node/security/Keyring.java rename to org.argeo.api/src/org/argeo/api/security/Keyring.java index fe054c3cc..c9228f074 100644 --- a/org.argeo.node.api/src/org/argeo/node/security/Keyring.java +++ b/org.argeo.api/src/org/argeo/api/security/Keyring.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.security; +package org.argeo.api.security; import java.io.InputStream; diff --git a/org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java b/org.argeo.api/src/org/argeo/api/security/NodeSecurityUtils.java similarity index 95% rename from org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java rename to org.argeo.api/src/org/argeo/api/security/NodeSecurityUtils.java index 7c784b0dc..245851285 100644 --- a/org.argeo.node.api/src/org/argeo/node/security/NodeSecurityUtils.java +++ b/org.argeo.api/src/org/argeo/api/security/NodeSecurityUtils.java @@ -1,4 +1,4 @@ -package org.argeo.node.security; +package org.argeo.api.security; import java.util.Arrays; import java.util.Collections; @@ -7,7 +7,7 @@ import java.util.List; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; public class NodeSecurityUtils { public final static LdapName ROLE_ADMIN_NAME, ROLE_DATA_ADMIN_NAME, ROLE_ANONYMOUS_NAME, ROLE_USER_NAME, diff --git a/org.argeo.node.api/src/org/argeo/node/security/PBEKeySpecCallback.java b/org.argeo.api/src/org/argeo/api/security/PBEKeySpecCallback.java similarity index 98% rename from org.argeo.node.api/src/org/argeo/node/security/PBEKeySpecCallback.java rename to org.argeo.api/src/org/argeo/api/security/PBEKeySpecCallback.java index f03ba9ddf..ba441e20b 100644 --- a/org.argeo.node.api/src/org/argeo/node/security/PBEKeySpecCallback.java +++ b/org.argeo.api/src/org/argeo/api/security/PBEKeySpecCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.security; +package org.argeo.api.security; import javax.crypto.spec.PBEKeySpec; import javax.security.auth.callback.Callback; diff --git a/org.argeo.node.api/src/org/argeo/node/tabular/ArrayTabularRow.java b/org.argeo.api/src/org/argeo/api/tabular/ArrayTabularRow.java similarity index 96% rename from org.argeo.node.api/src/org/argeo/node/tabular/ArrayTabularRow.java rename to org.argeo.api/src/org/argeo/api/tabular/ArrayTabularRow.java index 97bf025dc..c9f77106a 100644 --- a/org.argeo.node.api/src/org/argeo/node/tabular/ArrayTabularRow.java +++ b/org.argeo.api/src/org/argeo/api/tabular/ArrayTabularRow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.tabular; +package org.argeo.api.tabular; import java.util.List; diff --git a/org.argeo.node.api/src/org/argeo/node/tabular/TabularColumn.java b/org.argeo.api/src/org/argeo/api/tabular/TabularColumn.java similarity index 97% rename from org.argeo.node.api/src/org/argeo/node/tabular/TabularColumn.java rename to org.argeo.api/src/org/argeo/api/tabular/TabularColumn.java index 5cd11d198..b38c346d3 100644 --- a/org.argeo.node.api/src/org/argeo/node/tabular/TabularColumn.java +++ b/org.argeo.api/src/org/argeo/api/tabular/TabularColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.tabular; +package org.argeo.api.tabular; /** The column in a tabular content */ public class TabularColumn { diff --git a/org.argeo.node.api/src/org/argeo/node/tabular/TabularContent.java b/org.argeo.api/src/org/argeo/api/tabular/TabularContent.java similarity index 96% rename from org.argeo.node.api/src/org/argeo/node/tabular/TabularContent.java rename to org.argeo.api/src/org/argeo/api/tabular/TabularContent.java index a5aa9f678..0ffef217f 100644 --- a/org.argeo.node.api/src/org/argeo/node/tabular/TabularContent.java +++ b/org.argeo.api/src/org/argeo/api/tabular/TabularContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.tabular; +package org.argeo.api.tabular; import java.util.List; diff --git a/org.argeo.node.api/src/org/argeo/node/tabular/TabularRow.java b/org.argeo.api/src/org/argeo/api/tabular/TabularRow.java similarity index 96% rename from org.argeo.node.api/src/org/argeo/node/tabular/TabularRow.java rename to org.argeo.api/src/org/argeo/api/tabular/TabularRow.java index f652df947..5437015bf 100644 --- a/org.argeo.node.api/src/org/argeo/node/tabular/TabularRow.java +++ b/org.argeo.api/src/org/argeo/api/tabular/TabularRow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.tabular; +package org.argeo.api.tabular; /** A row of tabular data */ public interface TabularRow { diff --git a/org.argeo.node.api/src/org/argeo/node/tabular/TabularRowIterator.java b/org.argeo.api/src/org/argeo/api/tabular/TabularRowIterator.java similarity index 96% rename from org.argeo.node.api/src/org/argeo/node/tabular/TabularRowIterator.java rename to org.argeo.api/src/org/argeo/api/tabular/TabularRowIterator.java index 98a04a65c..d48b37b92 100644 --- a/org.argeo.node.api/src/org/argeo/node/tabular/TabularRowIterator.java +++ b/org.argeo.api/src/org/argeo/api/tabular/TabularRowIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.tabular; +package org.argeo.api.tabular; import java.util.Iterator; diff --git a/org.argeo.node.api/src/org/argeo/node/tabular/TabularWriter.java b/org.argeo.api/src/org/argeo/api/tabular/TabularWriter.java similarity index 96% rename from org.argeo.node.api/src/org/argeo/node/tabular/TabularWriter.java rename to org.argeo.api/src/org/argeo/api/tabular/TabularWriter.java index b7febee65..1a029472c 100644 --- a/org.argeo.node.api/src/org/argeo/node/tabular/TabularWriter.java +++ b/org.argeo.api/src/org/argeo/api/tabular/TabularWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.node.tabular; +package org.argeo.api.tabular; /** Write to a tabular content */ diff --git a/org.argeo.cms.e4.rap/OSGI-INF/cms-demo-rap.xml b/org.argeo.cms.e4.rap/OSGI-INF/cms-demo-rap.xml deleted file mode 100644 index e23b11b6a..000000000 --- a/org.argeo.cms.e4.rap/OSGI-INF/cms-demo-rap.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/org.argeo.cms.e4.rap/bnd.bnd b/org.argeo.cms.e4.rap/bnd.bnd index da09b3f8b..90dc8d42b 100644 --- a/org.argeo.cms.e4.rap/bnd.bnd +++ b/org.argeo.cms.e4.rap/bnd.bnd @@ -1,10 +1,7 @@ Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/cms-admin-rap.xml -#OSGI-INF/cms-demo-rap.xml -#Bundle-Activator: org.argeo.cms.script.ScriptAppActivator - -Import-Package: org.argeo.node,\ +Import-Package: org.argeo.api,\ org.eclipse.swt,\ org.eclipse.swt.graphics,\ org.eclipse.e4.ui.workbench,\ diff --git a/org.argeo.cms.e4.rap/cms/app.js b/org.argeo.cms.e4.rap/cms/app.js deleted file mode 100644 index cd5e099eb..000000000 --- a/org.argeo.cms.e4.rap/cms/app.js +++ /dev/null @@ -1,12 +0,0 @@ -var AppUi = Java.type('org.argeo.cms.script.AppUi') -var CmsE4EntryPointFactory = Java - .type('org.argeo.cms.e4.rap.CmsE4EntryPointFactory') - -APP.setWebPath('cms') -APP.setPageTitle('Argeo CMS') - -APP.getUi().put( - 'devops', - new AppUi(APP, new CmsE4EntryPointFactory( - 'org.argeo.cms.e4/e4xmi/cms-devops.e4xmi'))) -APP.getUi().get('devops').setPageTitle('Argeo CMS DevOps') diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java deleted file mode 100644 index 2987e4da3..000000000 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.argeo.cms.e4.rap; - -public class CmsE4DemoApp extends AbstractRapE4App { - public CmsE4DemoApp() { - setPageTitle("CMS Demo"); - setE4Xmi("org.argeo.cms.e4.rap/e4xmi/cms-demo-rap.e4xmi"); - setPath("/cms-e4"); - } - -} diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java index a062bea6b..f7a1ed667 100644 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java +++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java @@ -8,17 +8,17 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.UxContext; import org.argeo.cms.ui.dialogs.CmsFeedback; -import org.argeo.cms.util.SimpleImageManager; -import org.argeo.cms.util.SimpleUxContext; -import org.argeo.cms.widgets.auth.CmsLoginShell; +import org.argeo.cms.ui.util.SimpleImageManager; +import org.argeo.cms.ui.util.SimpleUxContext; +import org.argeo.cms.ui.widgets.auth.CmsLoginShell; import org.argeo.eclipse.ui.specific.UiContext; -import org.argeo.node.NodeConstants; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.workbench.UIEvents; import org.eclipse.e4.ui.workbench.lifecycle.PostContextCreate; diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-removeButtons.js b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-removeButtons.js deleted file mode 100644 index 20e82e34a..000000000 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-removeButtons.js +++ /dev/null @@ -1 +0,0 @@ -'Source,Save,Templates,Strike,Subscript,Superscript,CopyFormatting,Outdent,Indent,CreateDiv,JustifyLeft,JustifyCenter,JustifyRight,JustifyBlock,Language,Anchor,Flash,HorizontalRule,Smiley,SpecialChar,PageBreak,Iframe,Format,Font,FontSize,BGColor,TextColor,ShowBlocks,About,Preview,Print,Redo,Replace,Find,Undo,SelectAll,Scayt,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,NewPage,PasteFromWord,Blockquote,BidiLtr,BidiRtl' \ No newline at end of file diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbar.js b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbar.js deleted file mode 100644 index 305865546..000000000 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbar.js +++ /dev/null @@ -1,19 +0,0 @@ -CKEDITOR.editorConfig = function( config ) { - config.toolbarGroups = [ - { name: 'document', groups: [ 'mode', 'document', 'doctools' ] }, - { name: 'styles', groups: [ 'styles' ] }, - { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] }, - { name: 'forms', groups: [ 'forms' ] }, - { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] }, - { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ] }, - { name: 'insert', groups: [ 'insert' ] }, - { name: 'links', groups: [ 'links' ] }, - { name: 'clipboard', groups: [ 'clipboard', 'undo' ] }, - { name: 'colors', groups: [ 'colors' ] }, - { name: 'tools', groups: [ 'tools' ] }, - { name: 'others', groups: [ 'others' ] }, - { name: 'about', groups: [ 'about' ] } - ]; - - config.removeButtons = 'Source,Save,Templates,Strike,Subscript,Superscript,CopyFormatting,Outdent,Indent,CreateDiv,JustifyLeft,JustifyCenter,JustifyRight,JustifyBlock,BidiLtr,BidiRtl,Language,Anchor,Flash,HorizontalRule,Smiley,SpecialChar,PageBreak,Iframe,Format,Font,FontSize,BGColor,TextColor,Maximize,ShowBlocks,About,Preview,Print,Redo,Replace,Find,Undo,SelectAll,Scayt,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,NewPage,PasteFromWord,Blockquote'; -}; \ No newline at end of file diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbarGroups.json b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbarGroups.json deleted file mode 100644 index a886c2791..000000000 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbarGroups.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "name": "document", - "groups": [ - "mode", - "document", - "doctools" - ] - }, - { - "name": "styles", - "groups": [ - "styles" - ] - }, - { - "name": "editing", - "groups": [ - "find", - "selection", - "spellchecker", - "editing" - ] - }, - { - "name": "forms", - "groups": [ - "forms" - ] - }, - { - "name": "basicstyles", - "groups": [ - "basicstyles", - "cleanup" - ] - }, - { - "name": "paragraph", - "groups": [ - "list", - "indent", - "blocks", - "align", - "bidi", - "paragraph" - ] - }, - { - "name": "insert", - "groups": [ - "insert" - ] - }, - { - "name": "links", - "groups": [ - "links" - ] - }, - { - "name": "clipboard", - "groups": [ - "clipboard", - "undo" - ] - }, - { - "name": "colors", - "groups": [ - "colors" - ] - }, - { - "name": "tools", - "groups": [ - "tools" - ] - }, - { - "name": "others", - "groups": [ - "others" - ] - }, - { - "name": "about", - "groups": [ - "about" - ] - } -] \ No newline at end of file diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java deleted file mode 100644 index 68963f9b5..000000000 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.argeo.cms.e4.rap.parts; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; - -import javax.annotation.PostConstruct; - -import org.apache.commons.io.IOUtils; -import org.argeo.cms.CmsException; -import org.argeo.cms.util.CmsUtils; -import org.eclipse.nebula.widgets.richtext.RichTextEditor; -import org.eclipse.nebula.widgets.richtext.RichTextEditorConfiguration; -import org.eclipse.swt.SWT; -import org.eclipse.swt.browser.Browser; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; - -public class HtmlEditor { - - @PostConstruct - public void createUI(Composite parent) { - String toolbarGroups; - String removeButtons; - try { - toolbarGroups = IOUtils.toString(HtmlEditor.class.getResourceAsStream("CkEditor-toolbarGroups.json"), - StandardCharsets.UTF_8); - removeButtons = IOUtils.toString(HtmlEditor.class.getResourceAsStream("CkEditor-removeButtons.js"), - StandardCharsets.UTF_8); - } catch (IOException e) { - throw new CmsException("Cannot configure toolbar", e); - } -// System.out.println(toolbarGroups); -// System.out.println(removeButtons); - RichTextEditorConfiguration richTextEditorConfig = new RichTextEditorConfiguration(); - richTextEditorConfig.setOption(RichTextEditorConfiguration.TOOLBAR_GROUPS, toolbarGroups); - richTextEditorConfig.setOption(RichTextEditorConfiguration.REMOVE_BUTTONS, removeButtons); -// richTextEditorConfig.setRemoveStyles(false); -// richTextEditorConfig.setRemovePasteFromWord(true); -// richTextEditorConfig.setRemovePasteText(false); - -// richTextEditorConfig.setToolbarCollapsible(true); -// richTextEditorConfig.setToolbarInitialExpanded(false); - - final Display display = parent.getDisplay(); - Composite composite = new Composite(parent, SWT.NONE); -// composite.setLayoutData(new Fill); - composite.setLayout(new GridLayout()); - final RichTextEditor richTextEditor = new RichTextEditor(composite, richTextEditorConfig, SWT.BORDER); - richTextEditor.setText("Google"); - GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true); - richTextEditor.setLayoutData(layoutData); - richTextEditor.setBackground(new Color(display, 247, 247, 247)); - Composite toolbar = new Composite(composite, SWT.NONE); - toolbar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - toolbar.setLayout(new GridLayout(3, false)); - Button showContent = new Button(toolbar, SWT.PUSH); - showContent.setText("Show Content"); - showContent.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - showContent(parent, richTextEditor, false); - } - }); - Button showSource = new Button(toolbar, SWT.PUSH); - showSource.setText("Show Source"); - showSource.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - showContent(parent, richTextEditor, true); - } - }); - Button clearBtn = new Button(toolbar, SWT.NONE); - clearBtn.setText("Clear"); - clearBtn.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - richTextEditor.setText(""); - } - }); - - } - - private static void showContent(Composite parent, RichTextEditor editor, boolean source) { - int style = SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL; - final Shell content = new Shell(parent.getShell(), style); - content.setLayout(new GridLayout(1, true)); - String text = editor.getText(); - if (source) { - content.setText("Rich Text Source"); - Text viewer = new Text(content, SWT.MULTI | SWT.WRAP); - viewer.setLayoutData(new GridData(400, 400)); - viewer.setText(text); - viewer.setEditable(false); - } else { - content.setText("Rich Text"); - Browser viewer = new Browser(content, SWT.NONE); - viewer.setLayoutData(new GridData(400, 400)); - viewer.setText(text); - viewer.setEnabled(false); - } - Button ok = new Button(content, SWT.PUSH); - ok.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, false, false)); - ok.setText("OK"); - ok.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - content.dispose(); - } - }); - content.setDefaultButton(ok); - content.pack(); - Display display = parent.getDisplay(); - int left = (display.getClientArea().width / 2) - (content.getBounds().width / 2); - content.setLocation(left, 40); - content.open(); - ok.setFocus(); - } - -} diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/test.json b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/test.json deleted file mode 100644 index eed3f0e87..000000000 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/test.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "firstName": "John", - "lastName": "Smith", - "isAlive": true, - "age": 27, - "address": { - "streetAddress": "21 2nd Street", - "city": "New York", - "state": "NY", - "postalCode": "10021-3100" - }, - "phoneNumbers": [ - { - "type": "home", - "number": "212 555-1234" - }, - { - "type": "office", - "number": "646 555-4567" - }, - { - "type": "mobile", - "number": "123 456-7890" - } - ], - "children": [], - "spouse": null -} diff --git a/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml b/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml index 8653f09df..3fd7fdafb 100644 --- a/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml +++ b/org.argeo.cms.e4/OSGI-INF/defaultCallbackHandler.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.cms.e4/OSGI-INF/homeRepository.xml b/org.argeo.cms.e4/OSGI-INF/homeRepository.xml index c03e62e76..65690f262 100644 --- a/org.argeo.cms.e4/OSGI-INF/homeRepository.xml +++ b/org.argeo.cms.e4/OSGI-INF/homeRepository.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.cms.e4/bnd.bnd b/org.argeo.cms.e4/bnd.bnd index 5e64fedef..8714dab79 100644 --- a/org.argeo.cms.e4/bnd.bnd +++ b/org.argeo.cms.e4/bnd.bnd @@ -11,5 +11,5 @@ javax.jcr.nodetype,\ org.argeo.cms,\ org.eclipse.core.commands.common,\ org.eclipse.jface.window,\ -org.argeo.cms.widgets.auth,\ +org.argeo.cms.ui.widgets.auth,\ * diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/contexts/OsgiFilterContextFunction.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java similarity index 91% rename from org.argeo.cms.e4/src/org/argeo/cms/e4/contexts/OsgiFilterContextFunction.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java index b0fdcc108..c42a02a14 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/contexts/OsgiFilterContextFunction.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/OsgiFilterContextFunction.java @@ -1,4 +1,4 @@ -package org.argeo.cms.e4.contexts; +package org.argeo.cms.e4; import org.argeo.cms.CmsException; import org.eclipse.e4.core.contexts.ContextFunction; @@ -9,7 +9,7 @@ import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; -@SuppressWarnings("restriction") +/** An Eclipse 4 {@link ContextFunction} based on an OSGi filter. */ public class OsgiFilterContextFunction extends ContextFunction { private BundleContext bc = FrameworkUtil.getBundle(OsgiFilterContextFunction.class).getBundleContext(); diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java index 59d7ed401..21ea955b4 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java @@ -24,10 +24,10 @@ import java.nio.file.spi.FileSystemProvider; import javax.annotation.PostConstruct; import javax.inject.Inject; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.eclipse.ui.fs.AdvancedFsBrowser; import org.argeo.eclipse.ui.fs.SimpleFsBrowser; -import org.argeo.node.NodeUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java index 378409399..51528abd4 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java @@ -16,10 +16,10 @@ import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; import javax.transaction.UserTransaction; +import org.argeo.api.security.CryptoKeyring; import org.argeo.cms.CmsException; import org.argeo.cms.ui.dialogs.CmsMessageDialog; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.node.security.CryptoKeyring; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java index 3e328daa3..89a1bf5d1 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java @@ -31,6 +31,9 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventListener; import javax.jcr.observation.ObservationManager; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.CryptoKeyring; +import org.argeo.api.security.Keyring; import org.argeo.cms.CmsException; import org.argeo.cms.ui.jcr.JcrBrowserUtils; import org.argeo.cms.ui.jcr.NodeContentProvider; @@ -38,15 +41,12 @@ import org.argeo.cms.ui.jcr.NodeLabelProvider; import org.argeo.cms.ui.jcr.OsgiRepositoryRegister; import org.argeo.cms.ui.jcr.PropertiesContentProvider; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; -import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer; +import org.argeo.eclipse.ui.jcr.util.NodeViewerComparer; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.CryptoKeyring; -import org.argeo.node.security.Keyring; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.services.EMenuService; @@ -112,7 +112,7 @@ public class JcrBrowserView { // Create the tree on top of the view Composite top = new Composite(sashForm, SWT.NONE); // GridLayout gl = new GridLayout(1, false); - top.setLayout(CmsUtils.noSpaceGridLayout()); + top.setLayout(CmsUiUtils.noSpaceGridLayout()); try { this.userSession = this.nodeRepository.login(NodeConstants.HOME); @@ -136,7 +136,7 @@ public class JcrBrowserView { // Create the property viewer on the bottom Composite bottom = new Composite(sashForm, SWT.NONE); - bottom.setLayout(CmsUtils.noSpaceGridLayout()); + bottom.setLayout(CmsUiUtils.noSpaceGridLayout()); propertiesViewer = createPropertiesViewer(bottom); sashForm.setWeights(getWeights()); diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java index 89c44ca83..aefa95dbf 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java @@ -26,15 +26,15 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.SimpleCredentials; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.e4.jcr.JcrBrowserView; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/AbstractOsgiComposite.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java similarity index 88% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/AbstractOsgiComposite.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java index 8c893f2f3..c83183130 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/AbstractOsgiComposite.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java @@ -1,10 +1,10 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -20,8 +20,8 @@ abstract class AbstractOsgiComposite extends Composite { public AbstractOsgiComposite(Composite parent, int style) { super(parent, style); - parent.setLayout(CmsUtils.noSpaceGridLayout()); - setLayout(CmsUtils.noSpaceGridLayout()); + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); + setLayout(CmsUiUtils.noSpaceGridLayout()); setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); initUi(style); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java index 384cd72ef..2212b7b05 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java @@ -1,4 +1,4 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import static org.eclipse.swt.SWT.RIGHT; @@ -17,10 +17,10 @@ import javax.jcr.Value; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.util.CmsLink; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.widgets.EditableImage; -import org.argeo.cms.widgets.Img; +import org.argeo.cms.ui.util.CmsLink; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.widgets.EditableImage; +import org.argeo.cms.ui.widgets.Img; import org.argeo.jcr.JcrUtils; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ILazyContentProvider; @@ -31,7 +31,6 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.events.ControlAdapter; @@ -76,13 +75,13 @@ public class Browse implements CmsUiProvider { if (context == null) // return null; throw new CmsException("Context cannot be null"); - GridLayout layout = CmsUtils.noSpaceGridLayout(); + GridLayout layout = CmsUiUtils.noSpaceGridLayout(); layout.numColumns = 2; parent.setLayout(layout); // Left Composite leftCmp = new Composite(parent, SWT.NO_FOCUS); - leftCmp.setLayoutData(CmsUtils.fillAll()); + leftCmp.setLayoutData(CmsUiUtils.fillAll()); createBrowserPart(leftCmp, context); // Right @@ -103,17 +102,17 @@ public class Browse implements CmsUiProvider { } private void createBrowserPart(Composite parent, Node context) throws RepositoryException { - GridLayout layout = CmsUtils.noSpaceGridLayout(); + GridLayout layout = CmsUiUtils.noSpaceGridLayout(); parent.setLayout(layout); Composite filterCmp = new Composite(parent, SWT.NO_FOCUS); - filterCmp.setLayoutData(CmsUtils.fillWidth()); + filterCmp.setLayoutData(CmsUiUtils.fillWidth()); // top filter addFilterPanel(filterCmp); // scrolled composite scrolledCmp = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.BORDER | SWT.NO_FOCUS); - scrolledCmp.setLayoutData(CmsUtils.fillAll()); + scrolledCmp.setLayoutData(CmsUiUtils.fillAll()); scrolledCmp.setExpandVertical(true); scrolledCmp.setExpandHorizontal(true); scrolledCmp.setShowFocusedControl(true); @@ -133,7 +132,7 @@ public class Browse implements CmsUiProvider { } private Control initExplorer(Composite parent, Node context) throws RepositoryException { - parent.setLayout(CmsUtils.noSpaceGridLayout()); + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); createBrowserColumn(parent, context); return null; } @@ -141,7 +140,7 @@ public class Browse implements CmsUiProvider { private Control createBrowserColumn(Composite parent, Node context) throws RepositoryException { // TODO style is not correctly managed. FilterEntitiesVirtualTable table = new FilterEntitiesVirtualTable(parent, SWT.BORDER | SWT.NO_FOCUS, context); - // CmsUtils.style(table, ArgeoOrgStyle.browserColumn.style()); + // CmsUiUtils.style(table, ArgeoOrgStyle.browserColumn.style()); table.filterList("*"); table.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, true)); browserCols.put(context.getPath(), table); @@ -150,14 +149,14 @@ public class Browse implements CmsUiProvider { public void addFilterPanel(Composite parent) { - parent.setLayout(CmsUtils.noSpaceGridLayout(new GridLayout(2, false))); + parent.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(2, false))); // Text Area for the filter parentPathTxt = new Text(parent, SWT.NO_FOCUS); parentPathTxt.setEditable(false); filterTxt = new Text(parent, SWT.SEARCH | SWT.ICON_CANCEL); filterTxt.setMessage("Filter current list"); - filterTxt.setLayoutData(CmsUtils.fillWidth()); + filterTxt.setLayoutData(CmsUiUtils.fillWidth()); filterTxt.addModifyListener(new ModifyListener() { private static final long serialVersionUID = 7709303319740056286L; @@ -213,7 +212,7 @@ public class Browse implements CmsUiProvider { private void setEdited(Node node) { try { currEdited = node; - CmsUtils.clear(nodeDisplayParent); + CmsUiUtils.clear(nodeDisplayParent); createNodeView(nodeDisplayParent, currEdited); nodeDisplayParent.layout(); refreshFilters(node); @@ -283,7 +282,7 @@ public class Browse implements CmsUiProvider { if (!browserCols.containsKey(currNodePath)) createBrowserColumn(colViewer, node); - colViewer.setLayout(CmsUtils.noSpaceGridLayout(new GridLayout(browserCols.size(), false))); + colViewer.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(browserCols.size(), false))); // colViewer.pack(); colViewer.layout(); // also resize the scrolled composite @@ -331,7 +330,7 @@ public class Browse implements CmsUiProvider { // Name and primary type Label contextL = new Label(parent, SWT.NONE); - contextL.setData(RWT.MARKUP_ENABLED, true); + CmsUiUtils.markup(contextL); contextL.setText("" + context.getName() + ""); new Label(parent, SWT.NONE).setText(context.getPrimaryNodeType().getName()); @@ -438,7 +437,7 @@ public class Browse implements CmsUiProvider { protected void populate() { Composite parent = this; - GridLayout layout = CmsUtils.noSpaceGridLayout(); + GridLayout layout = CmsUiUtils.noSpaceGridLayout(); this.setLayout(layout); createTableViewer(parent); @@ -453,17 +452,17 @@ public class Browse implements CmsUiProvider { GridData gd = new GridData(SWT.LEFT, SWT.FILL, false, true); gd.widthHint = COLUMN_WIDTH; listCmp.setLayoutData(gd); - listCmp.setLayout(CmsUtils.noSpaceGridLayout()); + listCmp.setLayout(CmsUiUtils.noSpaceGridLayout()); entityViewer = new TableViewer(listCmp, SWT.VIRTUAL | SWT.SINGLE); Table table = entityViewer.getTable(); - table.setLayoutData(CmsUtils.fillAll()); + table.setLayoutData(CmsUiUtils.fillAll()); table.setLinesVisible(true); table.setHeaderVisible(false); - table.setData(RWT.MARKUP_ENABLED, Boolean.TRUE); + CmsUiUtils.markup(table); - CmsUtils.style(table, MaintenanceStyles.BROWSER_COLUMN); + CmsUiUtils.style(table, MaintenanceStyles.BROWSER_COLUMN); // first column TableViewerColumn column = new TableViewerColumn(entityViewer, SWT.NONE); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/ConnectivityDeploymentUi.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/ConnectivityDeploymentUi.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java index f4f3079b6..7e8a99196 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/ConnectivityDeploymentUi.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/ConnectivityDeploymentUi.java @@ -1,6 +1,6 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -38,7 +38,7 @@ class ConnectivityDeploymentUi extends AbstractOsgiComposite { Label label = new Label(this, SWT.NONE); label.setData(new GridData(SWT.FILL, SWT.FILL, false, false)); - CmsUtils.markup(label); + CmsUiUtils.markup(label); label.setText(text.toString()); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/DataDeploymentUi.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java similarity index 97% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/DataDeploymentUi.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java index 613e3cb64..a750e9541 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/DataDeploymentUi.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DataDeploymentUi.java @@ -1,4 +1,4 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import java.io.File; import java.io.IOException; @@ -9,8 +9,8 @@ import java.util.Collection; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.argeo.cms.util.CmsUtils; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -106,7 +106,7 @@ class DataDeploymentUi extends AbstractOsgiComposite { } Label label = new Label(parent, SWT.NONE); label.setData(new GridData(SWT.FILL, SWT.FILL, false, false)); - CmsUtils.markup(label); + CmsUiUtils.markup(label); label.setText("" + text.toString() + ""); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/DeploymentEntryPoint.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java similarity index 88% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/DeploymentEntryPoint.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java index 8dda4c476..a746b3c46 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/DeploymentEntryPoint.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java @@ -1,13 +1,12 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.argeo.cms.util.CmsUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeDeployment; -import org.argeo.node.NodeState; -import org.eclipse.rap.rwt.application.AbstractEntryPoint; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeDeployment; +import org.argeo.api.NodeState; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; @@ -19,11 +18,9 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -class DeploymentEntryPoint extends AbstractEntryPoint { - private static final long serialVersionUID = -881152502968982437L; +class DeploymentEntryPoint { private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); - @Override protected void createContents(Composite parent) { // FIXME manage authentication if needed // if (!CurrentUser.roles().contains(AuthConstants.ROLE_ADMIN)) @@ -71,7 +68,7 @@ class DeploymentEntryPoint extends AbstractEntryPoint { NodeState nodeState = bc.getService(nodeStateRef); ServiceReference nodeDeploymentRef = bc.getServiceReference(NodeDeployment.class); Label label = new Label(composite, SWT.WRAP); - CmsUtils.markup(label); + CmsUiUtils.markup(label); if (nodeDeploymentRef == null) { label.setText("Not yet deployed on
" + nodeState.getHostname() + "
, please configure below."); } else { @@ -88,7 +85,7 @@ class DeploymentEntryPoint extends AbstractEntryPoint { private static Group createHighLevelGroup(Composite parent, String text) { Group group = new Group(parent, SWT.NONE); group.setText(text); - CmsUtils.markup(group); + CmsUiUtils.markup(group); return group; } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/LogDeploymentUi.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java similarity index 94% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/LogDeploymentUi.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java index 8fb96437c..05923fb47 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/LogDeploymentUi.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/LogDeploymentUi.java @@ -1,4 +1,4 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -6,7 +6,7 @@ import java.util.Enumeration; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -37,8 +37,7 @@ class LogDeploymentUi extends AbstractOsgiComposite implements LogListener { this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); logDisplay = new Text(this, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY); logDisplay.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - CmsUtils.markup(logDisplay); - @SuppressWarnings("unchecked") + CmsUiUtils.markup(logDisplay); Enumeration logEntries = (Enumeration) logReader.getLog(); while (logEntries.hasMoreElements()) logDisplay.append(printEntry(logEntries.nextElement())); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceStyles.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java similarity index 86% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceStyles.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java index fef25d7ce..df1be51ad 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceStyles.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/MaintenanceStyles.java @@ -1,4 +1,4 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; /** Specific styles used by the various maintenance pages . */ public interface MaintenanceStyles { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java similarity index 87% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java index 8a903448f..122f5cfaa 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/NonAdminPage.java @@ -1,10 +1,10 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -18,7 +18,7 @@ public class NonAdminPage implements CmsUiProvider{ public Control createUi(Composite parent, Node context) throws RepositoryException { Composite body = new Composite(parent, SWT.NO_FOCUS); - body.setLayoutData(CmsUtils.fillAll()); + body.setLayoutData(CmsUiUtils.fillAll()); body.setLayout(new GridLayout()); Label label = new Label(body, SWT.NONE); label.setText("You should be an admin to perform maintenance operations. " diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/SecurityDeploymentUi.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java similarity index 95% rename from org.argeo.cms.ui/src/org/argeo/cms/maintenance/SecurityDeploymentUi.java rename to org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java index 9fcdaf980..4edbf565a 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/SecurityDeploymentUi.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/SecurityDeploymentUi.java @@ -1,8 +1,8 @@ -package org.argeo.cms.maintenance; +package org.argeo.cms.e4.maintenance; import java.net.URI; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -75,7 +75,7 @@ class SecurityDeploymentUi extends AbstractOsgiComposite { } Label label = new Label(parent, SWT.NONE); label.setData(new GridData(SWT.FILL, SWT.FILL, false, false)); - CmsUtils.markup(label); + CmsUiUtils.markup(label); label.setText(text.toString()); } diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java index 3c9347a71..c957656c6 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java @@ -282,7 +282,7 @@ public abstract class AbstractRoleEditor { Text text = new Text(parent, SWT.BORDER); text.setText(value); text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - // CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + // CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); return text; } @@ -295,7 +295,7 @@ public abstract class AbstractRoleEditor { text.setText(value); text.setLayoutData(new GridData(SWT.LEAD, SWT.FILL, true, false)); text.setEditable(false); - // CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + // CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); return text; } diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java index a2c920aa8..12cc53999 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java @@ -15,10 +15,10 @@ */ package org.argeo.cms.e4.users; +import static org.argeo.api.NodeInstance.WORKGROUP; import static org.argeo.cms.auth.UserAdminUtils.setProperty; import static org.argeo.naming.LdapAttrs.businessCategory; import static org.argeo.naming.LdapAttrs.description; -import static org.argeo.node.NodeInstance.WORKGROUP; import java.util.ArrayList; import java.util.Iterator; @@ -34,6 +34,9 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.transaction.UserTransaction; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeInstance; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -42,15 +45,12 @@ import org.argeo.cms.e4.users.providers.RoleIconLP; import org.argeo.cms.e4.users.providers.UserFilter; import org.argeo.cms.ui.eclipse.forms.AbstractFormPart; import org.argeo.cms.ui.eclipse.forms.IManagedForm; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.JcrUtils; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeInstance; -import org.argeo.node.NodeUtils; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; @@ -161,7 +161,7 @@ public class GroupEditor extends AbstractRoleEditor { // GridLayout layout = new GridLayout(5, false); GridLayout layout = new GridLayout(2, false); body.setLayout(layout); - body.setLayoutData(CmsUtils.fillWidth()); + body.setLayoutData(CmsUiUtils.fillWidth()); String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name()); createReadOnlyLT(body, "Name", cn); @@ -302,7 +302,7 @@ public class GroupEditor extends AbstractRoleEditor { ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT); ToolBar toolBar = toolBarManager.createControl(body); - toolBar.setLayoutData(CmsUtils.fillWidth()); + toolBar.setLayoutData(CmsUiUtils.fillWidth()); toolBarManager.add(action); toolBarManager.update(true); @@ -568,7 +568,7 @@ public class GroupEditor extends AbstractRoleEditor { // lbl.setFont(EclipseUiUtils.getBoldFont(parent)); // Text text = toolkit.createText(parent, value, SWT.BORDER); // text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - // CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + // CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); // return text; // } // @@ -580,7 +580,7 @@ public class GroupEditor extends AbstractRoleEditor { // Text text = toolkit.createText(parent, value, SWT.NONE); // text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); // text.setEditable(false); - // CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + // CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); // return text; // } diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java index e9a4a25f1..6f0828dd4 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java @@ -24,6 +24,7 @@ import javax.inject.Inject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -43,7 +44,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.e4.ui.workbench.modeling.ESelectionService; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java index 5eecaac21..951dd2415 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java @@ -12,8 +12,8 @@ import java.util.TreeSet; import javax.transaction.Status; import javax.transaction.UserTransaction; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.UserAdminConf; import org.osgi.service.useradmin.UserAdmin; import org.osgi.service.useradmin.UserAdminEvent; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java index ed797c58a..7513102fe 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java @@ -10,6 +10,7 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; @@ -22,7 +23,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.dialogs.IPageChangeProvider; import org.eclipse.jface.dialogs.IPageChangedListener; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java index a35499984..3d67b8c3b 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java @@ -28,6 +28,7 @@ import java.util.List; import javax.inject.Inject; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -37,12 +38,11 @@ import org.argeo.cms.e4.users.providers.UserFilter; import org.argeo.cms.ui.eclipse.forms.AbstractFormPart; //import org.argeo.cms.ui.eclipse.forms.FormToolkit; import org.argeo.cms.ui.eclipse.forms.IManagedForm; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; @@ -119,7 +119,7 @@ public class UserEditor extends AbstractRoleEditor { // mainLayout.marginRight = 10; body.setLayout(mainLayout); // body.getParent().setLayout(new GridLayout()); - // body.setLayoutData(CmsUtils.fillAll()); + // body.setLayoutData(CmsUiUtils.fillAll()); User user = getDisplayedUser(); appendOverviewPart(body, user); // Remove to ability to force the password for his own user. The user @@ -293,7 +293,7 @@ public class UserEditor extends AbstractRoleEditor { // Composite body= parent; Composite body = new Composite(parent, SWT.BORDER); body.setLayout(new GridLayout()); - body.setLayoutData(CmsUtils.fillAll()); + body.setLayoutData(CmsUiUtils.fillAll()); // boolean isAdmin = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN); @@ -361,7 +361,7 @@ public class UserEditor extends AbstractRoleEditor { Action action = new RemoveMembershipAction(userViewer, user, tooltip, SecurityAdminImages.ICON_REMOVE_DESC); ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT); ToolBar toolBar = toolBarManager.createControl(body); - toolBar.setLayoutData(CmsUtils.fillWidth()); + toolBar.setLayoutData(CmsUiUtils.fillWidth()); toolBarManager.add(action); toolBarManager.update(true); return userViewerCmp; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java index 377605f5d..a47ca2dc3 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java @@ -22,6 +22,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -34,7 +35,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.e4.ui.workbench.modeling.ESelectionService; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java index 859081e94..d9a75b89e 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java @@ -1,10 +1,10 @@ package org.argeo.cms.e4.users.providers; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeInstance; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.SecurityAdminImages; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeInstance; import org.eclipse.swt.graphics.Image; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java index 7be078ac5..e090fe251 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java @@ -2,9 +2,9 @@ package org.argeo.cms.e4.users.providers; import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.osgi.service.useradmin.User; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceUi.java b/org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceUi.java deleted file mode 100644 index 11b0b9077..000000000 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/MaintenanceUi.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.argeo.cms.maintenance; - -import org.eclipse.rap.rwt.application.Application; -import org.eclipse.rap.rwt.application.ApplicationConfiguration; - -public class MaintenanceUi implements ApplicationConfiguration { - - @Override - public void configure(Application application) { - // application.addEntryPoint("/status", DeploymentEntryPoint.class, - // null); - } - -} diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java index 2cd86ce08..6b61ae396 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.HttpRequestCallback; @@ -31,7 +32,6 @@ import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.JcrUtils; import org.argeo.naming.AuthPassword; import org.argeo.naming.SharedSecret; -import org.argeo.node.NodeConstants; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.AbstractEntryPoint; import org.eclipse.rap.rwt.client.WebClient; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java index 6ef4b315c..8a12c100e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java @@ -3,7 +3,7 @@ package org.argeo.cms.ui; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.node.MvcProvider; +import org.argeo.api.MvcProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java index fa85dff46..eb50ef2f3 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java @@ -1,7 +1,7 @@ package org.argeo.cms.ui.dialogs; import org.argeo.cms.CmsMsg; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.Selected; import org.argeo.eclipse.ui.dialogs.LightweightDialog; @@ -57,7 +57,7 @@ public class CmsMessageDialog extends LightweightDialog { body.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); Label messageLbl = new Label(body, SWT.WRAP); - CmsUtils.markup(messageLbl); + CmsUiUtils.markup(messageLbl); messageLbl.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); messageLbl.setFont(EclipseUiUtils.getBoldFont(parent)); if (message != null) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java index de41bbfe1..b3860f780 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java @@ -4,7 +4,7 @@ import java.lang.reflect.InvocationTargetException; import org.argeo.cms.CmsException; import org.argeo.cms.CmsMsg; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.Selected; import org.argeo.eclipse.ui.dialogs.LightweightDialog; @@ -57,7 +57,7 @@ public class CmsWizardDialog extends LightweightDialog implements IWizardContain Composite messageArea = new Composite(parent, SWT.NONE); messageArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); { - messageArea.setLayout(CmsUtils.noSpaceGridLayout(new GridLayout(2, false))); + messageArea.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(2, false))); titleBar = new Label(messageArea, SWT.WRAP); titleBar.setFont(EclipseUiUtils.getBoldFont(parent)); titleBar.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, true, false)); @@ -78,7 +78,7 @@ public class CmsWizardDialog extends LightweightDialog implements IWizardContain IWizardPage[] pages = wizard.getPages(); for (int i = 0; i < pages.length; i++) { pageBodies[i] = new Composite(body, SWT.NONE); - pageBodies[i].setLayout(CmsUtils.noSpaceGridLayout()); + pageBodies[i].setLayout(CmsUiUtils.noSpaceGridLayout()); setSwitchingFormData(pageBodies[i]); pages[i].createControl(pageBodies[i]); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableLink.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/EditableLink.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java index ece0be36b..e74de5ee8 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java @@ -1,9 +1,9 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.viewers.EditablePart; +import org.argeo.cms.ui.viewers.EditablePart; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java index 859f64b28..24b1d0c67 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java @@ -1,13 +1,13 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import java.util.List; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.viewers.EditablePart; -import org.argeo.cms.widgets.StyledControl; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.viewers.EditablePart; +import org.argeo.cms.ui.widgets.StyledControl; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; @@ -70,7 +70,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab /** To be overridden */ protected void setContainerLayoutData(Composite composite) { - composite.setLayoutData(CmsUtils.fillWidth()); + composite.setLayoutData(CmsUiUtils.fillWidth()); } @Override @@ -115,8 +115,8 @@ public class EditableMultiStringProperty extends StyledControl implements Editab protected Label createValueLabel(Composite parent, int style, String value) { Label label = new Label(parent, style); label.setText("#" + value); - CmsUtils.markup(label); - CmsUtils.style(label, FormStyle.propertyText.style()); + CmsUiUtils.markup(label); + CmsUiUtils.style(label, FormStyle.propertyText.style()); return label; } @@ -131,7 +131,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab Button deleteBtn = new Button(valCmp, SWT.FLAT); deleteBtn.setData(FormConstants.LINKED_VALUE, value); deleteBtn.addSelectionListener(removeValueSL); - CmsUtils.style(deleteBtn, FormStyle.delete.style() + FormStyle.BUTTON_SUFFIX); + CmsUiUtils.style(deleteBtn, FormStyle.delete.style() + FormStyle.BUTTON_SUFFIX); GridData gd = new GridData(); gd.heightHint = btnHeight; gd.widthHint = btnWidth; @@ -146,7 +146,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab // The "add new value" text is not meant to change, so we can set it on // creation text.setMessage(message); - CmsUtils.style(text, style); + CmsUiUtils.style(text, style); text.setFocus(); text.addTraverseListener(new TraverseListener() { @@ -211,8 +211,8 @@ public class EditableMultiStringProperty extends StyledControl implements Editab if (canEdit) { Label lbl = new Label(box, getStyle()); lbl.setText(message); - CmsUtils.style(lbl, style); - CmsUtils.markup(lbl); + CmsUiUtils.style(lbl, style); + CmsUiUtils.markup(lbl); if (mouseListener != null) lbl.addMouseListener(mouseListener); return lbl; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditablePropertyDate.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/EditablePropertyDate.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java index 928a28508..4428d1451 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditablePropertyDate.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import java.text.DateFormat; import java.util.Calendar; @@ -7,9 +7,9 @@ import java.util.GregorianCalendar; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.viewers.EditablePart; -import org.argeo.cms.widgets.StyledControl; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.viewers.EditablePart; +import org.argeo.cms.ui.widgets.StyledControl; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; @@ -120,29 +120,29 @@ public class EditablePropertyDate extends StyledControl implements EditablePart protected Label createLabel(Composite box, String style) { Label lbl = new Label(box, getStyle() | SWT.WRAP); - lbl.setLayoutData(CmsUtils.fillWidth()); - CmsUtils.style(lbl, style); - CmsUtils.markup(lbl); + lbl.setLayoutData(CmsUiUtils.fillWidth()); + CmsUiUtils.style(lbl, style); + CmsUiUtils.markup(lbl); if (mouseListener != null) lbl.addMouseListener(mouseListener); return lbl; } private Control createCustomEditableControl(Composite box, String style) { - box.setLayoutData(CmsUtils.fillWidth()); + box.setLayoutData(CmsUiUtils.fillWidth()); Composite dateComposite = new Composite(box, SWT.NONE); GridLayout gl = EclipseUiUtils.noSpaceGridLayout(new GridLayout(2, false)); gl.horizontalSpacing = fieldBtnSpacing; dateComposite.setLayout(gl); dateTxt = new Text(dateComposite, SWT.BORDER); - CmsUtils.style(dateTxt, style); + CmsUiUtils.style(dateTxt, style); dateTxt.setLayoutData(new GridData(120, SWT.DEFAULT)); dateTxt.setToolTipText("Enter a date with form \"" + FormUtils.DEFAULT_SHORT_DATE_FORMAT + "\" or use the calendar"); openCalBtn = new Button(dateComposite, SWT.FLAT); - CmsUtils.style(openCalBtn, FormStyle.calendar.style() + CmsUiUtils.style(openCalBtn, FormStyle.calendar.style() + FormStyle.BUTTON_SUFFIX); GridData gd = new GridData(SWT.CENTER, SWT.CENTER, false, false); gd.heightHint = 17; @@ -227,8 +227,8 @@ public class EditablePropertyDate extends StyledControl implements EditablePart super(source.getDisplay(), SWT.NO_TRIM | SWT.BORDER | SWT.ON_TOP); populate(); // Add border and shadow style - CmsUtils.markup(CalendarPopup.this); - CmsUtils.style(CalendarPopup.this, FormStyle.popupCalendar.style()); + CmsUiUtils.markup(CalendarPopup.this); + CmsUiUtils.style(CalendarPopup.this, FormStyle.popupCalendar.style()); pack(); layout(); setLocation(source.toDisplay((source.getLocation().x - 2), diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditablePropertyString.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java similarity index 89% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/EditablePropertyString.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java index dd3ff29dc..1ab0338cb 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditablePropertyString.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java @@ -1,13 +1,13 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; -import static org.argeo.cms.forms.FormStyle.propertyMessage; -import static org.argeo.cms.forms.FormStyle.propertyText; +import static org.argeo.cms.ui.forms.FormStyle.propertyMessage; +import static org.argeo.cms.ui.forms.FormStyle.propertyText; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.viewers.EditablePart; -import org.argeo.cms.widgets.EditableText; +import org.argeo.cms.ui.viewers.EditablePart; +import org.argeo.cms.ui.widgets.EditableText; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormConstants.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormConstants.java similarity index 82% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/FormConstants.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormConstants.java index 18df3e47f..fe9f7e7d7 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormConstants.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormConstants.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; /** Constants used in the various CMS Forms */ public interface FormConstants { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java similarity index 92% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java index 92ce9da0c..7d4612731 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import java.util.Observable; import java.util.Observer; @@ -6,7 +6,7 @@ import java.util.Observer; import javax.jcr.Node; import org.argeo.cms.ui.CmsEditable; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -57,10 +57,10 @@ public class FormEditorHeader implements SelectionListener, Observer { display = new Composite(parent, SWT.NONE); display.setLayoutData(layoutData); - CmsUtils.style(display, FormStyle.header.style()); + CmsUiUtils.style(display, FormStyle.header.style()); display.setBackgroundMode(SWT.INHERIT_FORCE); - display.setLayout(CmsUtils.noSpaceGridLayout()); + display.setLayout(CmsUiUtils.noSpaceGridLayout()); publishBtn = createSimpleBtn(display, getPublishButtonLabel()); display.moveAbove(null); @@ -70,7 +70,7 @@ public class FormEditorHeader implements SelectionListener, Observer { private Button createSimpleBtn(Composite parent, String label) { Button button = new Button(parent, SWT.FLAT | SWT.PUSH); button.setText(label); - CmsUtils.style(button, FormStyle.header.style()); + CmsUiUtils.style(button, FormStyle.header.style()); button.addSelectionListener(this); return button; } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java similarity index 94% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java index d2af709a8..3ae2036ae 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import java.io.IOException; import java.io.InputStream; @@ -19,14 +19,14 @@ import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.ui.CmsImageManager; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.viewers.AbstractPageViewer; -import org.argeo.cms.viewers.EditablePart; -import org.argeo.cms.viewers.Section; -import org.argeo.cms.viewers.SectionPart; -import org.argeo.cms.widgets.EditableImage; -import org.argeo.cms.widgets.Img; -import org.argeo.cms.widgets.StyledControl; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.viewers.AbstractPageViewer; +import org.argeo.cms.ui.viewers.EditablePart; +import org.argeo.cms.ui.viewers.Section; +import org.argeo.cms.ui.viewers.SectionPart; +import org.argeo.cms.ui.widgets.EditableImage; +import org.argeo.cms.ui.widgets.Img; +import org.argeo.cms.ui.widgets.StyledControl; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.eclipse.jface.dialogs.MessageDialog; @@ -305,7 +305,7 @@ public class FormPageViewer extends AbstractPageViewer { protected CmsImageManager imageManager() { if (imageManager == null) - imageManager = CmsUtils.getCmsView().getImageManager(); + imageManager = CmsUiUtils.getCmsView().getImageManager(); return imageManager; } @@ -314,8 +314,8 @@ public class FormPageViewer extends AbstractPageViewer { Section section = null; if (node != null) { section = new Section(body, SWT.NO_FOCUS, node); - section.setLayoutData(CmsUtils.fillWidth()); - section.setLayout(CmsUtils.noSpaceGridLayout()); + section.setLayoutData(CmsUiUtils.fillWidth()); + section.setLayout(CmsUiUtils.noSpaceGridLayout()); } return section; } @@ -327,7 +327,7 @@ public class FormPageViewer extends AbstractPageViewer { EditablePropertyString eps = new EditablePropertyString(bodyRow, SWT.WRAP | SWT.LEFT, node, propName, msg); eps.setMouseListener(getMouseListener()); eps.setFocusListener(getFocusListener()); - eps.setLayoutData(CmsUtils.fillWidth()); + eps.setLayoutData(CmsUiUtils.fillWidth()); } } @@ -352,7 +352,7 @@ public class FormPageViewer extends AbstractPageViewer { addListeners(emsp); // emsp.setMouseListener(getMouseListener()); emsp.setStyle(FormStyle.propertyMessage.style()); - emsp.setLayoutData(CmsUtils.fillWidth()); + emsp.setLayoutData(CmsUiUtils.fillWidth()); } } @@ -361,10 +361,10 @@ public class FormPageViewer extends AbstractPageViewer { } protected Label createPropertyLbl(Composite parent, String value, int vAlign) { - boolean isSmall = CmsUtils.getCmsView().getUxContext().isSmall(); + boolean isSmall = CmsUiUtils.getCmsView().getUxContext().isSmall(); Label label = new Label(parent, isSmall ? SWT.LEFT : SWT.RIGHT | SWT.WRAP); label.setText(value + " "); - CmsUtils.style(label, FormStyle.propertyLabel.style()); + CmsUiUtils.style(label, FormStyle.propertyLabel.style()); GridData gd = new GridData(isSmall ? SWT.LEFT : SWT.RIGHT, vAlign, false, false); gd.widthHint = labelColWidth; label.setLayoutData(gd); @@ -374,13 +374,13 @@ public class FormPageViewer extends AbstractPageViewer { protected Label newStyledLabel(Composite parent, String style, String value) { Label label = new Label(parent, SWT.NONE); label.setText(value); - CmsUtils.style(label, style); + CmsUiUtils.style(label, style); return label; } protected Composite createRowLayoutComposite(Composite parent) throws RepositoryException { Composite bodyRow = new Composite(parent, SWT.NO_FOCUS); - bodyRow.setLayoutData(CmsUtils.fillWidth()); + bodyRow.setLayoutData(CmsUiUtils.fillWidth()); RowLayout rl = new RowLayout(SWT.WRAP); rl.type = SWT.HORIZONTAL; rl.spacing = rowLayoutHSpacing; @@ -478,15 +478,15 @@ public class FormPageViewer extends AbstractPageViewer { @Override protected void setContainerLayoutData(Composite composite) { - composite.setLayoutData(CmsUtils.grabWidth(SWT.CENTER, SWT.DEFAULT)); + composite.setLayoutData(CmsUiUtils.grabWidth(SWT.CENTER, SWT.DEFAULT)); } @Override protected void setControlLayoutData(Control control) { - control.setLayoutData(CmsUtils.grabWidth(SWT.CENTER, SWT.DEFAULT)); + control.setLayoutData(CmsUiUtils.grabWidth(SWT.CENTER, SWT.DEFAULT)); } }; - img.setLayoutData(CmsUtils.grabWidth(SWT.CENTER, SWT.DEFAULT)); + img.setLayoutData(CmsUiUtils.grabWidth(SWT.CENTER, SWT.DEFAULT)); updateContent(img); addListeners(img); return img; @@ -495,7 +495,7 @@ public class FormPageViewer extends AbstractPageViewer { protected Composite addDeleteAbility(final Section section, final Node sessionNode, int topWeight, int rightWeight) { Composite comp = new Composite(section, SWT.NONE); - comp.setLayoutData(CmsUtils.fillAll()); + comp.setLayoutData(CmsUiUtils.fillAll()); comp.setLayout(new FormLayout()); // The body to be populated @@ -505,7 +505,7 @@ public class FormPageViewer extends AbstractPageViewer { if (getCmsEditable().canEdit()) { // the delete button Button deleteBtn = new Button(comp, SWT.FLAT); - CmsUtils.style(deleteBtn, FormStyle.deleteOverlay.style()); + CmsUiUtils.style(deleteBtn, FormStyle.deleteOverlay.style()); FormData formData = new FormData(); formData.right = new FormAttachment(rightWeight, 0); formData.top = new FormAttachment(topWeight, 0); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormStyle.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java similarity index 95% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/FormStyle.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java index 6a496a25d..7e1b8b029 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormStyle.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; /** Syles used */ public enum FormStyle { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java index be087027a..a5475d6e5 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import java.text.DateFormat; import java.text.ParseException; @@ -13,7 +13,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsView; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; @@ -56,7 +56,7 @@ public class FormUtils { @Override public void doubleClick(DoubleClickEvent event) { - CmsView cmsView = CmsUtils.getCmsView(); + CmsView cmsView = CmsUiUtils.getCmsView(); Node node = (Node) ((IStructuredSelection) event.getSelection()) .getFirstElement(); try { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/MarkupValidatorCopy.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/MarkupValidatorCopy.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/forms/MarkupValidatorCopy.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/forms/MarkupValidatorCopy.java index f1a5a8c41..3f588d1ea 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/MarkupValidatorCopy.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/MarkupValidatorCopy.java @@ -1,4 +1,4 @@ -package org.argeo.cms.forms; +package org.argeo.cms.ui.forms; import java.io.StringReader; import java.text.MessageFormat; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java index 8aab1ec21..4e0067521 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java @@ -18,9 +18,10 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.Session; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.fs.FileIconNameLabelProvider; @@ -29,7 +30,6 @@ import org.argeo.eclipse.ui.fs.FsUiConstants; import org.argeo.eclipse.ui.fs.FsUiUtils; import org.argeo.eclipse.ui.fs.NioFileLabelProvider; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -277,7 +277,7 @@ public class CmsFsBrowser extends Composite { else nameStr = path.getFileName().toString(); elemBtn.setText(nameStr + " >> "); - CmsUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN); + CmsUiUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN); elemBtn.addSelectionListener(new SelectionAdapter() { private static final long serialVersionUID = -4103695476023480651L; @@ -323,7 +323,7 @@ public class CmsFsBrowser extends Composite { } private void populateBookmarks(Composite parent) { - CmsUtils.clear(parent); + CmsUiUtils.clear(parent); parent.setLayout(new GridLayout()); ISelectionChangedListener selList = new BookmarksSelChangeListener(); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java index ffb5f0a83..f45629b04 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/FsContextMenu.java @@ -18,7 +18,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.eclipse.jface.dialogs.MessageDialog; @@ -70,7 +70,7 @@ public class FsContextMenu extends Shell { Composite boxCmp = new Composite(this, SWT.NO_FOCUS | SWT.BORDER); boxCmp.setLayout(EclipseUiUtils.noSpaceGridLayout()); - CmsUtils.style(boxCmp, FsStyles.CONTEXT_MENU_BOX); + CmsUiUtils.style(boxCmp, FsStyles.CONTEXT_MENU_BOX); createContextMenu(boxCmp); addShellListener(new ActionsShellListener()); @@ -82,8 +82,8 @@ public class FsContextMenu extends Shell { Button btn = new Button(boxCmp, SWT.FLAT | SWT.PUSH | SWT.LEAD); btn.setText(getLabel(actionId)); btn.setLayoutData(EclipseUiUtils.fillWidth()); - CmsUtils.markup(btn); - CmsUtils.style(btn, actionId + FsStyles.BUTTON_SUFFIX); + CmsUiUtils.markup(btn); + CmsUiUtils.style(btn, actionId + FsStyles.BUTTON_SUFFIX); btn.setData(KEY_ACTION_ID, actionId); btn.addSelectionListener(asl); actionButtons.put(actionId, btn); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/img/Dummy.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/img/Dummy.java deleted file mode 100644 index 4c48f7114..000000000 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/img/Dummy.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.argeo.cms.ui.img; - -public class Dummy { - -} diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java index 6417b25fe..9ffddd8f3 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java @@ -1,6 +1,6 @@ package org.argeo.cms.ui.internal; -import org.argeo.node.NodeState; +import org.argeo.api.NodeState; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java index 3bb1fdf15..5602d991b 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java @@ -2,8 +2,8 @@ package org.argeo.cms.ui.internal; import javax.jcr.RepositoryException; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.widgets.EditableImage; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.widgets.EditableImage; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -41,16 +41,16 @@ public class SimpleEditableImage extends EditableImage { protected String createImgTag() throws RepositoryException { String imgTag; if (src != null) - imgTag = CmsUtils.img(src, imageSize); + imgTag = CmsUiUtils.img(src, imageSize); else - imgTag = CmsUtils.noImg(imageSize != null ? imageSize + imgTag = CmsUiUtils.noImg(imageSize != null ? imageSize : NO_IMAGE_SIZE); return imgTag; } protected Text createText(Composite box, String style) { Text text = new Text(box, getStyle()); - CmsUtils.style(text, style); + CmsUiUtils.style(text, style); return text; } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/rwt/UserUi.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/rwt/UserUi.java index 88cd17b81..5e21cc428 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/rwt/UserUi.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/rwt/UserUi.java @@ -1,6 +1,6 @@ package org.argeo.cms.ui.internal.rwt; -import org.argeo.cms.util.LoginEntryPoint; +import org.argeo.cms.ui.util.LoginEntryPoint; import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.application.Application.OperationMode; import org.eclipse.rap.rwt.application.ApplicationConfiguration; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/DefaultRepositoryRegister.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/DefaultRepositoryRegister.java index d5e639f62..7a0603eb7 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/DefaultRepositoryRegister.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/DefaultRepositoryRegister.java @@ -25,7 +25,7 @@ import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; public class DefaultRepositoryRegister extends Observable implements RepositoryRegister { /** Key for a JCR repository alias */ diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java index b688e6259..8f9ac1c75 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java @@ -24,7 +24,7 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator; +import org.argeo.eclipse.ui.jcr.util.JcrItemsComparator; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java index 9cccb52b1..0a662e216 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java @@ -26,12 +26,12 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ui.jcr.model.RepositoriesElem; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; import org.argeo.eclipse.ui.TreeParent; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/PropertiesContentProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/PropertiesContentProvider.java index d67b1330c..5883be5ba 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/PropertiesContentProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/PropertiesContentProvider.java @@ -24,7 +24,7 @@ import javax.jcr.PropertyIterator; import javax.jcr.RepositoryException; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator; +import org.argeo.eclipse.ui.jcr.util.JcrItemsComparator; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java index ad173cf38..58bbc3baf 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java @@ -24,11 +24,11 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.SimpleCredentials; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.TreeParent; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; /** Root of a remote repository */ public class RemoteRepositoryElem extends RepositoryElem { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java index c772424b7..a5af700b1 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java @@ -24,13 +24,13 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ui.jcr.RepositoryRegister; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; /** * UI Tree component that implements the Argeo abstraction of a diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/AppUi.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/AppUi.java similarity index 95% rename from org.argeo.cms.ui/src/org/argeo/cms/script/AppUi.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/AppUi.java index a2a554736..229378674 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/AppUi.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/AppUi.java @@ -1,4 +1,4 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; import java.util.HashMap; import java.util.Map; @@ -10,9 +10,9 @@ import javax.script.Invocable; import javax.script.ScriptException; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.util.CmsPane; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.util.SimpleErgonomics; +import org.argeo.cms.ui.util.CmsPane; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.util.SimpleErgonomics; import org.argeo.eclipse.ui.Selected; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.Application; @@ -122,9 +122,9 @@ public class AppUi implements CmsUiProvider, Branding { if (false) { // QA - CmsUtils.style(cmsPane.getQaArea(), "qa"); + CmsUiUtils.style(cmsPane.getQaArea(), "qa"); Button reload = new Button(cmsPane.getQaArea(), SWT.FLAT); - CmsUtils.style(reload, "qa"); + CmsUiUtils.style(reload, "qa"); reload.setText("Reload"); reload.addSelectionListener(new Selected() { private static final long serialVersionUID = 1L; @@ -143,9 +143,9 @@ public class AppUi implements CmsUiProvider, Branding { }); // Support - CmsUtils.style(cmsPane.getSupportArea(), "support"); + CmsUiUtils.style(cmsPane.getSupportArea(), "support"); Label msg = new Label(cmsPane.getSupportArea(), SWT.NONE); - CmsUtils.style(msg, "support"); + CmsUiUtils.style(msg, "support"); msg.setText("UNSUPPORTED DEVELOPMENT VERSION"); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/Branding.java similarity index 90% rename from org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/Branding.java index 39b5b531e..f72338ef7 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/Branding.java @@ -1,4 +1,4 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; import java.util.Map; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java similarity index 97% rename from org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java index e63941210..c3e1a72e6 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java @@ -1,4 +1,4 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; import java.io.IOException; import java.io.InputStream; @@ -25,9 +25,9 @@ import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsConstants; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.util.BundleResourceLoader; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.util.SimpleErgonomics; +import org.argeo.cms.ui.util.BundleResourceLoader; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.util.SimpleErgonomics; import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.application.Application.OperationMode; import org.eclipse.rap.rwt.application.ApplicationConfiguration; @@ -222,7 +222,7 @@ public class CmsScriptApp implements Branding { @Override public void handleException(Throwable throwable) { // TODO be smarter - CmsUtils.getCmsView().exception(throwable); + CmsUiUtils.getCmsView().exception(throwable); } } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java index cc5ea7ff5..d7c1a63ce 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java @@ -1,4 +1,4 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; import java.io.IOException; import java.io.InputStreamReader; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptAppActivator.java similarity index 97% rename from org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptAppActivator.java index edf25bb00..7813156ec 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptAppActivator.java @@ -1,4 +1,4 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; import javax.jcr.Repository; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptUi.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptUi.java index fd9aa9d31..bf68fc299 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptUi.java @@ -1,4 +1,4 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; import java.net.URL; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/Theme.java similarity index 82% rename from org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/Theme.java index 584f521e0..c053b4700 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/Theme.java @@ -1,6 +1,6 @@ -package org.argeo.cms.script; +package org.argeo.cms.ui.script; -import org.argeo.cms.util.CmsTheme; +import org.argeo.cms.ui.util.CmsTheme; import org.osgi.framework.BundleContext; /** @deprecated Use CmsTheme instead. */ diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/cms.js similarity index 77% rename from org.argeo.cms.ui/src/org/argeo/cms/script/cms.js rename to org.argeo.cms.ui/src/org/argeo/cms/ui/script/cms.js index ac2eecfba..be9618dcb 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/cms.js @@ -1,15 +1,15 @@ // CMS -var ScrolledPage = Java.type('org.argeo.cms.widgets.ScrolledPage'); +var ScrolledPage = Java.type('org.argeo.cms.ui.widgets.ScrolledPage'); -var CmsScriptApp = Java.type('org.argeo.cms.script.CmsScriptApp'); -var AppUi = Java.type('org.argeo.cms.script.AppUi'); -var Theme = Java.type('org.argeo.cms.script.Theme'); -var ScriptUi = Java.type('org.argeo.cms.script.ScriptUi'); -var CmsUtils = Java.type('org.argeo.cms.util.CmsUtils'); -var SimpleCmsHeader = Java.type('org.argeo.cms.util.SimpleCmsHeader'); -var CmsLink = Java.type('org.argeo.cms.util.CmsLink'); -var MenuLink = Java.type('org.argeo.cms.util.MenuLink'); -var UserMenuLink = Java.type('org.argeo.cms.util.UserMenuLink'); +var CmsScriptApp = Java.type('org.argeo.cms.ui.script.CmsScriptApp'); +var AppUi = Java.type('org.argeo.cms.ui.script.AppUi'); +var Theme = Java.type('org.argeo.cms.ui.script.Theme'); +var ScriptUi = Java.type('org.argeo.cms.ui.script.ScriptUi'); +var CmsUtils = Java.type('org.argeo.cms.ui.util.CmsUiUtils'); +var SimpleCmsHeader = Java.type('org.argeo.cms.ui.util.SimpleCmsHeader'); +var CmsLink = Java.type('org.argeo.cms.ui.util.CmsLink'); +var MenuLink = Java.type('org.argeo.cms.ui.util.MenuLink'); +var UserMenuLink = Java.type('org.argeo.cms.ui.util.UserMenuLink'); // SWT var SWT = Java.type('org.eclipse.swt.SWT'); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java index 36a1da28e..a521b973f 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java @@ -18,13 +18,13 @@ package org.argeo.cms.ui.useradmin; import java.util.ArrayList; import java.util.List; +import org.argeo.api.NodeConstants; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.viewers.DoubleClickEvent; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java index 2d494ef90..05c6f3778 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java @@ -1,7 +1,7 @@ package org.argeo.cms.ui.useradmin; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.node.NodeConstants; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleResourceLoader.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleResourceLoader.java index 7342e1052..13df119b1 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleResourceLoader.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.io.IOException; import java.io.InputStream; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java index b18770f18..b3c4a8a57 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.io.InputStream; import java.net.MalformedURLException; @@ -10,11 +10,11 @@ import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsStyles; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.node.NodeUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; import org.eclipse.swt.SWT; @@ -86,7 +86,7 @@ public class CmsLink implements CmsUiProvider { // } Composite comp = new Composite(parent, SWT.NONE); - comp.setLayout(CmsUtils.noSpaceGridLayout()); + comp.setLayout(CmsUiUtils.noSpaceGridLayout()); Label link = new Label(comp, SWT.NONE); link.setData(RWT.MARKUP_ENABLED, Boolean.TRUE); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsPane.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsPane.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/util/CmsPane.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsPane.java index a8d085cfe..68f1e0f89 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsPane.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsPane.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -14,7 +14,7 @@ public class CmsPane { private Composite supportArea; public CmsPane(Composite parent, int style) { - parent.setLayout(CmsUtils.noSpaceGridLayout()); + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); // qaArea = new Composite(parent, SWT.NONE); // qaArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsTheme.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsTheme.java index 8bb7098cf..8b1f874f7 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsTheme.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java index f4004e493..316e7859f 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.io.IOException; import java.io.InputStream; @@ -9,13 +9,13 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.servlet.http.HttpServletRequest; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsConstants; import org.argeo.cms.ui.CmsView; import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; import org.eclipse.swt.SWT; @@ -35,8 +35,8 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; /** Static utilities for the CMS framework. */ -public class CmsUtils implements CmsConstants { - // private final static Log log = LogFactory.getLog(CmsUtils.class); +public class CmsUiUtils implements CmsConstants { + // private final static Log log = LogFactory.getLog(CmsUiUtils.class); /** * The CMS view related to this display, or null if none is available from this @@ -204,7 +204,7 @@ public class CmsUtils implements CmsConstants { public static String noImg(Point size) { ResourceManager rm = RWT.getResourceManager(); - return CmsUtils.img(rm.getLocation(NO_IMAGE), size); + return CmsUiUtils.img(rm.getLocation(NO_IMAGE), size); } public static String noImg() { @@ -243,6 +243,6 @@ public class CmsUtils implements CmsConstants { + " Aliquam velit velit, rutrum ut augue sed, condimentum lacinia augue."; /** Singleton. */ - private CmsUtils() { + private CmsUiUtils() { } } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/DefaultImageManager.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/DefaultImageManager.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java index 015ca1ce9..e2ab5c856 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/DefaultImageManager.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import static javax.jcr.Node.JCR_CONTENT; import static javax.jcr.Property.JCR_DATA; @@ -50,7 +50,7 @@ public class DefaultImageManager implements CmsImageManager { } else { // no image if not completely known size = resizeTo(NO_IMAGE_SIZE, preferredSize != null ? preferredSize : imageSize); - imgTag = CmsUtils.noImg(size); + imgTag = CmsUiUtils.noImg(size); } } else if (preferredSize.x != 0 && preferredSize.y != 0) { @@ -75,7 +75,7 @@ public class DefaultImageManager implements CmsImageManager { imgTag = getImageTag(node, size); // if (imgTag == null) - imgTag = CmsUtils.noImg(size); + imgTag = CmsUiUtils.noImg(size); else loaded = true; } @@ -85,7 +85,7 @@ public class DefaultImageManager implements CmsImageManager { // lbl.setSize(size); } else if (control instanceof FileUpload) { FileUpload lbl = (FileUpload) control; - lbl.setImage(CmsUtils.noImage(size)); + lbl.setImage(CmsUiUtils.noImage(size)); lbl.setSize(size); return loaded; } else @@ -144,13 +144,13 @@ public class DefaultImageManager implements CmsImageManager { String url = getImageUrl(node); if (url == null) return null; - return CmsUtils.imgBuilder(url, width, height); + return CmsUiUtils.imgBuilder(url, width, height); } /** @return null if not available */ @Override public String getImageUrl(Node node) throws RepositoryException { - return CmsUtils.getDataPath(node); + return CmsUiUtils.getDataPath(node); // String name = getResourceName(node); // ResourceManager resourceManager = RWT.getResourceManager(); // if (!resourceManager.isRegistered(name)) { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java index b7bf9103a..50d844fcb 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.util.Locale; @@ -9,15 +9,15 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.UxContext; -import org.argeo.cms.widgets.auth.CmsLogin; -import org.argeo.cms.widgets.auth.CmsLoginShell; +import org.argeo.cms.ui.widgets.auth.CmsLogin; +import org.argeo.cms.ui.widgets.auth.CmsLoginShell; import org.argeo.eclipse.ui.specific.UiContext; -import org.argeo.node.NodeConstants; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.EntryPoint; import org.eclipse.swt.events.SelectionListener; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/MenuLink.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/MenuLink.java index 79fd7cb72..d58143659 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/MenuLink.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import org.argeo.cms.ui.CmsStyles; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleApp.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleApp.java index 327438b56..0f5b079c8 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleApp.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.io.IOException; import java.io.InputStream; @@ -20,13 +20,13 @@ import javax.jcr.version.VersionManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsConstants; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ui.LifeCycleUiProvider; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.application.Application.OperationMode; @@ -287,7 +287,7 @@ public class SimpleApp implements CmsConstants, ApplicationConfiguration { @Override public void handleException(Throwable throwable) { // TODO be smarter - CmsUtils.getCmsView().exception(throwable); + CmsUiUtils.getCmsView().exception(throwable); } } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleCmsHeader.java similarity index 92% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleCmsHeader.java index ae1299dc8..04ce5a290 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleCmsHeader.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ public class SimpleCmsHeader implements CmsUiProvider { Composite header = new Composite(parent, SWT.NONE); header.setData(RWT.CUSTOM_VARIANT, CmsStyles.CMS_HEADER); header.setBackgroundMode(SWT.INHERIT_DEFAULT); - header.setLayout(CmsUtils.noSpaceGridLayout(new GridLayout(3, false))); + header.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(3, false))); configurePart(context, header, lead); configurePart(context, header, center); @@ -58,7 +58,7 @@ public class SimpleCmsHeader implements CmsUiProvider { part.setData(RWT.CUSTOM_VARIANT, custom); GridData gridData = new GridData(style, SWT.FILL, true, true); part.setLayoutData(gridData); - part.setLayout(CmsUtils.noSpaceGridLayout(new GridLayout(partProviders.size(), subPartsSameWidth))); + part.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(partProviders.size(), subPartsSameWidth))); for (CmsUiProvider uiProvider : partProviders) { Control subPart = uiProvider.createUi(part, context); subPart.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleDynamicPages.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleDynamicPages.java index dd95e7f35..8e0e7c179 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleDynamicPages.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleErgonomics.java similarity index 94% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleErgonomics.java index 3f06d88e8..92133f572 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleErgonomics.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.util.Map; @@ -55,7 +55,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { @Override protected void initUi(Composite parent) { parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - parent.setLayout(CmsUtils.noSpaceGridLayout(new GridLayout(3, false))); + parent.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(3, false))); uxContext = new SimpleUxContext(); if (!getUxContext().isMasterData()) @@ -69,17 +69,17 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { // TODO: bi-directional leftArea = new Composite(parent, SWT.NONE); leftArea.setLayoutData(new GridData(SWT.LEAD, SWT.TOP, false, false)); - leftArea.setLayout(CmsUtils.noSpaceGridLayout()); + leftArea.setLayout(CmsUiUtils.noSpaceGridLayout()); bodyArea = new Composite(parent, SWT.NONE); bodyArea.setData(RWT.CUSTOM_VARIANT, CmsStyles.CMS_BODY); bodyArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - bodyArea.setLayout(CmsUtils.noSpaceGridLayout()); + bodyArea.setLayout(CmsUiUtils.noSpaceGridLayout()); // TODO: bi-directional rightArea = new Composite(parent, SWT.NONE); rightArea.setLayoutData(new GridData(SWT.END, SWT.TOP, false, false)); - rightArea.setLayout(CmsUtils.noSpaceGridLayout()); + rightArea.setLayout(CmsUiUtils.noSpaceGridLayout()); footerArea = new Composite(parent, SWT.NONE); // footerArea.setLayout(new FillLayout()); @@ -134,7 +134,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { for (Control child : area.getChildren()) child.dispose(); - CmsUtils.style(area, style); + CmsUiUtils.style(area, style); try { uiProvider.createUi(area, getNode()); } catch (RepositoryException e) { @@ -157,7 +157,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { // clear for (Control child : bodyArea.getChildren()) child.dispose(); - bodyArea.setLayout(CmsUtils.noSpaceGridLayout()); + bodyArea.setLayout(CmsUiUtils.noSpaceGridLayout()); try { Node node = getNode(); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleImageManager.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleImageManager.java similarity index 68% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleImageManager.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleImageManager.java index 4e90766a6..ac09b2a02 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleImageManager.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleImageManager.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; public class SimpleImageManager extends DefaultImageManager { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStaticPage.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStaticPage.java index 8ac3e963a..d394f23ac 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStaticPage.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleUxContext.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleUxContext.java index bde67e404..f85a1ab53 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleUxContext.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import org.argeo.cms.ui.UxContext; import org.eclipse.swt.graphics.Point; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/StyleSheetResourceLoader.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/StyleSheetResourceLoader.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/util/StyleSheetResourceLoader.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/StyleSheetResourceLoader.java index face42b0f..ad1523c1a 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/StyleSheetResourceLoader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/StyleSheetResourceLoader.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SystemNotifications.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/SystemNotifications.java index 5fa79a331..f53e55262 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SystemNotifications.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.io.PrintWriter; import java.io.StringWriter; @@ -89,7 +89,7 @@ public class SystemNotifications extends Shell implements CmsStyles, .append(e.getMessage()); } Label mailTo = new Label(pane, SWT.NONE); - CmsUtils.markup(mailTo); + CmsUiUtils.markup(mailTo); mailTo.setText("Send details"); mailTo.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false)); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/ThemeUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/ThemeUtils.java similarity index 97% rename from org.argeo.cms.ui/src/org/argeo/cms/util/ThemeUtils.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/ThemeUtils.java index fdc1cb78a..90b684040 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/ThemeUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/ThemeUtils.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.net.URL; import java.util.Enumeration; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java similarity index 91% rename from org.argeo.cms.ui/src/org/argeo/cms/util/UserMenu.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java index 58b470dc8..07b60696b 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenu.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java @@ -1,9 +1,9 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import javax.jcr.Node; import org.argeo.cms.CmsException; -import org.argeo.cms.widgets.auth.CmsLoginShell; +import org.argeo.cms.ui.widgets.auth.CmsLoginShell; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ShellAdapter; import org.eclipse.swt.events.ShellEvent; @@ -17,7 +17,7 @@ public class UserMenu extends CmsLoginShell { private final Node context; public UserMenu(Control source, Node context) { - super(CmsUtils.getCmsView()); + super(CmsUiUtils.getCmsView()); this.context = context; createUi(); if (source == null) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenuLink.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenuLink.java index 839567f4f..cc470e414 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenuLink.java @@ -1,11 +1,11 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import javax.jcr.Node; import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsStyles; -import org.argeo.cms.widgets.auth.CmsLoginShell; +import org.argeo.cms.ui.widgets.auth.CmsLoginShell; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.MouseEvent; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/VerticalMenu.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/VerticalMenu.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/util/VerticalMenu.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/util/VerticalMenu.java index d0ea610f1..e7dfb4b88 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/VerticalMenu.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/VerticalMenu.java @@ -1,4 +1,4 @@ -package org.argeo.cms.util; +package org.argeo.cms.ui.util; import java.util.ArrayList; import java.util.List; @@ -20,7 +20,7 @@ public class VerticalMenu implements CmsUiProvider { Composite part = new Composite(parent, SWT.NONE); part.setLayoutData(new GridData(SWT.LEAD, SWT.TOP, false, false)); // part.setData(RWT.CUSTOM_VARIANT, custom); - part.setLayout(CmsUtils.noSpaceGridLayout()); + part.setLayout(CmsUiUtils.noSpaceGridLayout()); for (CmsUiProvider uiProvider : items) { Control subPart = uiProvider.createUi(part, context); subPart.setLayoutData(new GridData(SWT.LEAD, SWT.TOP, false, false)); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java index eaaf4bc3f..1445fed33 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import java.security.AccessControlContext; import java.security.AccessController; @@ -15,7 +15,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsEditable; -import org.argeo.cms.widgets.ScrolledPage; +import org.argeo.cms.ui.widgets.ScrolledPage; import org.eclipse.jface.viewers.ContentViewer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/EditablePart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/EditablePart.java similarity index 82% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/EditablePart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/EditablePart.java index 99f8acf9a..158beaf1e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/EditablePart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/EditablePart.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import org.eclipse.swt.widgets.Control; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/ItemPart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/ItemPart.java similarity index 85% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/ItemPart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/ItemPart.java index 52e5a88eb..4ca45d191 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/ItemPart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/ItemPart.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import javax.jcr.Item; import javax.jcr.RepositoryException; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java index bc3166307..dfd143829 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import java.util.Observable; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/NodePart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/NodePart.java similarity index 80% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/NodePart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/NodePart.java index db9a60a87..b51d4fcba 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/NodePart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/NodePart.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import javax.jcr.Node; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/PropertyPart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/PropertyPart.java similarity index 83% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/PropertyPart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/PropertyPart.java index 50fdd0601..793079e20 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/PropertyPart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/PropertyPart.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import javax.jcr.Property; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java index e59b57de6..83ea56076 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; import java.util.Collections; import java.util.LinkedHashMap; @@ -8,8 +8,8 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.widgets.JcrComposite; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.widgets.JcrComposite; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -37,7 +37,7 @@ public class Section extends JcrComposite { } else { relativeDepth = 0; } - setLayout(CmsUtils.noSpaceGridLayout()); + setLayout(CmsUiUtils.noSpaceGridLayout()); } public Map getSubSections() throws RepositoryException { @@ -70,8 +70,8 @@ public class Section extends JcrComposite { throw new CmsException("Section header was already created"); sectionHeader = new Composite(this, SWT.NONE); - sectionHeader.setLayoutData(CmsUtils.fillWidth()); - sectionHeader.setLayout(CmsUtils.noSpaceGridLayout()); + sectionHeader.setLayoutData(CmsUiUtils.fillWidth()); + sectionHeader.setLayout(CmsUiUtils.noSpaceGridLayout()); // sectionHeader.moveAbove(null); // layout(); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/SectionPart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java similarity index 84% rename from org.argeo.cms.ui/src/org/argeo/cms/viewers/SectionPart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java index 6cd45c5ba..f0b367f5a 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/SectionPart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java @@ -1,4 +1,4 @@ -package org.argeo.cms.viewers; +package org.argeo.cms.ui.viewers; /** An editable part dynamically related to a Section */ diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/EditableImage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java similarity index 87% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/EditableImage.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java index 2e70eb89f..0a327cd51 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/EditableImage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java @@ -1,11 +1,11 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; import javax.jcr.Node; import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -49,15 +49,15 @@ public abstract class EditableImage extends StyledControl { /** To be overriden. */ protected String createImgTag() throws RepositoryException { - return CmsUtils.noImg(preferredImageSize != null ? preferredImageSize + return CmsUiUtils.noImg(preferredImageSize != null ? preferredImageSize : getSize()); } protected Label createLabel(Composite box, String style) { Label lbl = new Label(box, getStyle()); - // lbl.setLayoutData(CmsUtils.fillWidth()); - CmsUtils.markup(lbl); - CmsUtils.style(lbl, style); + // lbl.setLayoutData(CmsUiUtils.fillWidth()); + CmsUiUtils.markup(lbl); + CmsUiUtils.style(lbl, style); if (mouseListener != null) lbl.addMouseListener(mouseListener); load(lbl); @@ -72,13 +72,13 @@ public abstract class EditableImage extends StyledControl { } catch (Exception e) { // throw new CmsException("Cannot retrieve image", e); log.error("Cannot retrieve image", e); - imgTag = CmsUtils.noImg(preferredImageSize); + imgTag = CmsUiUtils.noImg(preferredImageSize); loaded = false; } if (imgTag == null) { loaded = false; - imgTag = CmsUtils.noImg(preferredImageSize); + imgTag = CmsUiUtils.noImg(preferredImageSize); } else loaded = true; if (control != null) { @@ -101,7 +101,7 @@ public abstract class EditableImage extends StyledControl { protected Text createText(Composite box, String style) { Text text = new Text(box, getStyle()); - CmsUtils.style(text, style); + CmsUiUtils.style(text, style); return text; } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/EditableText.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableText.java similarity index 87% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/EditableText.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableText.java index e7c56ea72..21f48138c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/EditableText.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableText.java @@ -1,9 +1,9 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; import javax.jcr.Item; import javax.jcr.RepositoryException; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -39,9 +39,9 @@ public class EditableText extends StyledControl { protected Label createLabel(Composite box, String style) { Label lbl = new Label(box, getStyle() | SWT.WRAP); - lbl.setLayoutData(CmsUtils.fillWidth()); - CmsUtils.style(lbl, style); - CmsUtils.markup(lbl); + lbl.setLayoutData(CmsUiUtils.fillWidth()); + CmsUiUtils.style(lbl, style); + CmsUiUtils.markup(lbl); if (mouseListener != null) lbl.addMouseListener(mouseListener); return lbl; @@ -49,10 +49,10 @@ public class EditableText extends StyledControl { protected Text createText(Composite box, String style) { final Text text = new Text(box, getStyle() | SWT.MULTI | SWT.WRAP); - GridData textLayoutData = CmsUtils.fillWidth(); + GridData textLayoutData = CmsUiUtils.fillWidth(); // textLayoutData.heightHint = preferredHeight; text.setLayoutData(textLayoutData); - CmsUtils.style(text, style); + CmsUiUtils.style(text, style); text.setFocus(); return text; } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/Img.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java similarity index 90% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/Img.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java index 59c4823b2..055fcf56f 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/Img.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -6,10 +6,10 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.internal.JcrFileUploadReceiver; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.viewers.NodePart; -import org.argeo.cms.viewers.Section; -import org.argeo.cms.viewers.SectionPart; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.viewers.NodePart; +import org.argeo.cms.ui.viewers.Section; +import org.argeo.cms.ui.viewers.SectionPart; import org.eclipse.rap.fileupload.FileUploadHandler; import org.eclipse.rap.fileupload.FileUploadListener; import org.eclipse.rap.fileupload.FileUploadReceiver; @@ -49,8 +49,8 @@ public class Img extends EditableImage implements SectionPart, NodePart { Point preferredImageSize) throws RepositoryException { super(parent, swtStyle, imgNode, false, preferredImageSize); this.section = section; - imageManager = CmsUtils.getCmsView().getImageManager(); - CmsUtils.style(this, TextStyles.TEXT_IMG); + imageManager = CmsUiUtils.getCmsView().getImageManager(); + CmsUiUtils.style(this, TextStyles.TEXT_IMG); } @Override @@ -91,7 +91,7 @@ public class Img extends EditableImage implements SectionPart, NodePart { // FileDialog fileDialog = new FileDialog(getShell()); // fileDialog.open(); // String fileName = fileDialog.getFileName(); - CmsImageManager imageManager = CmsUtils.getCmsView().getImageManager(); + CmsImageManager imageManager = CmsUiUtils.getCmsView().getImageManager(); Node node = getNode(); JcrFileUploadReceiver receiver = new JcrFileUploadReceiver( node.getParent(), node.getName() + '[' + node.getIndex() + ']', @@ -101,7 +101,7 @@ public class Img extends EditableImage implements SectionPart, NodePart { currentUploadHandler = prepareUpload(receiver); final ServerPushSession pushSession = new ServerPushSession(); final FileUpload fileUpload = new FileUpload(box, SWT.NONE); - CmsUtils.style(fileUpload, style); + CmsUiUtils.style(fileUpload, style); fileUpload.addSelectionListener(new SelectionAdapter() { private static final long serialVersionUID = -9158471843941668562L; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/JcrComposite.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/JcrComposite.java similarity index 97% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/JcrComposite.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/JcrComposite.java index 358b45315..d47aba792 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/JcrComposite.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/JcrComposite.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; import javax.jcr.Item; import javax.jcr.Node; @@ -7,7 +7,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.argeo.cms.CmsException; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -58,7 +58,7 @@ public class JcrComposite extends Composite { if (cacheImmediately) this.cache = node; } - setLayout(CmsUtils.noSpaceGridLayout()); + setLayout(CmsUiUtils.noSpaceGridLayout()); } public synchronized Node getNode() { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/ScrolledPage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/ScrolledPage.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java index c36ed2052..5dd00adf2 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/ScrolledPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java similarity index 93% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java index 4d999d501..b085fdf9c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/StyledControl.java @@ -1,10 +1,10 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; import javax.jcr.Item; import javax.jcr.RepositoryException; import org.argeo.cms.ui.CmsConstants; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.MouseListener; @@ -26,7 +26,7 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants public StyledControl(Composite parent, int swtStyle) { super(parent, swtStyle); - setLayout(CmsUtils.noSpaceGridLayout()); + setLayout(CmsUiUtils.noSpaceGridLayout()); } public StyledControl(Composite parent, int style, Item item) throws RepositoryException { @@ -42,7 +42,7 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants protected Composite createBox(Composite parent) { Composite box = new Composite(parent, SWT.INHERIT_DEFAULT); setContainerLayoutData(box); - box.setLayout(CmsUtils.noSpaceGridLayout()); + box.setLayout(CmsUiUtils.noSpaceGridLayout()); // new Label(box, SWT.NONE).setText("BOX"); return box; } @@ -97,12 +97,12 @@ public abstract class StyledControl extends JcrComposite implements CmsConstants /** To be overridden */ protected void setControlLayoutData(Control control) { - control.setLayoutData(CmsUtils.fillWidth()); + control.setLayoutData(CmsUiUtils.fillWidth()); } /** To be overridden */ protected void setContainerLayoutData(Composite composite) { - composite.setLayoutData(CmsUtils.fillWidth()); + composite.setLayoutData(CmsUiUtils.fillWidth()); } protected void clear(boolean deep) { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/TextStyles.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TextStyles.java similarity index 97% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/TextStyles.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TextStyles.java index be5bc5fea..e461ed0df 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/TextStyles.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TextStyles.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets; +package org.argeo.cms.ui.widgets; /** Styles references in the CSS. */ public interface TextStyles { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/AbstractLoginDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/AbstractLoginDialog.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/AbstractLoginDialog.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/AbstractLoginDialog.java index b86fcb0b0..1d34b9df3 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/AbstractLoginDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/AbstractLoginDialog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import java.io.IOException; import java.util.Arrays; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java similarity index 91% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java index cc0e766d4..4533f6498 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import static org.argeo.cms.CmsMsg.password; import static org.argeo.cms.CmsMsg.username; @@ -19,16 +19,16 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeState; import org.argeo.cms.CmsMsg; import org.argeo.cms.LocaleUtils; import org.argeo.cms.auth.HttpRequestCallback; import org.argeo.cms.ui.CmsStyles; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.internal.Activator; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.specific.UiContext; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeState; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; @@ -101,7 +101,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler { } public final void defaultCreateContents(Composite parent) { - parent.setLayout(CmsUtils.noSpaceGridLayout()); + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); Composite credentialsBlock = createCredentialsBlock(parent); if (parent instanceof Shell) { credentialsBlock.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true)); @@ -124,14 +124,14 @@ public class CmsLogin implements CmsStyles, CallbackHandler { Locale locale = localeChoice == null ? this.defaultLocale : localeChoice.getSelectedLocale(); credentialsBlock = new Composite(parent, SWT.NONE); credentialsBlock.setLayout(new GridLayout()); - // credentialsBlock.setLayoutData(CmsUtils.fillAll()); + // credentialsBlock.setLayoutData(CmsUiUtils.fillAll()); specificUserUi(credentialsBlock); Label l = new Label(credentialsBlock, SWT.NONE); - CmsUtils.style(l, CMS_USER_MENU_ITEM); + CmsUiUtils.style(l, CMS_USER_MENU_ITEM); l.setText(CmsMsg.logout.lead(locale)); - GridData lData = CmsUtils.fillWidth(); + GridData lData = CmsUiUtils.fillWidth(); lData.widthHint = 120; l.setLayoutData(lData); @@ -155,25 +155,25 @@ public class CmsLogin implements CmsStyles, CallbackHandler { // We need a composite for the traversal credentialsBlock = new Composite(parent, SWT.NONE); credentialsBlock.setLayout(new GridLayout()); - // credentialsBlock.setLayoutData(CmsUtils.fillAll()); - CmsUtils.style(credentialsBlock, CMS_LOGIN_DIALOG); + // credentialsBlock.setLayoutData(CmsUiUtils.fillAll()); + CmsUiUtils.style(credentialsBlock, CMS_LOGIN_DIALOG); Integer textWidth = 120; if (parent instanceof Shell) - CmsUtils.style(parent, CMS_USER_MENU); + CmsUiUtils.style(parent, CMS_USER_MENU); // new Label(this, SWT.NONE).setText(CmsMsg.username.lead()); usernameT = new Text(credentialsBlock, SWT.BORDER); usernameT.setMessage(username.lead(locale)); - CmsUtils.style(usernameT, CMS_LOGIN_DIALOG_USERNAME); - GridData gd = CmsUtils.fillWidth(); + CmsUiUtils.style(usernameT, CMS_LOGIN_DIALOG_USERNAME); + GridData gd = CmsUiUtils.fillWidth(); gd.widthHint = textWidth; usernameT.setLayoutData(gd); // new Label(this, SWT.NONE).setText(CmsMsg.password.lead()); passwordT = new Text(credentialsBlock, SWT.BORDER | SWT.PASSWORD); passwordT.setMessage(password.lead(locale)); - CmsUtils.style(passwordT, CMS_LOGIN_DIALOG_PASSWORD); - gd = CmsUtils.fillWidth(); + CmsUiUtils.style(passwordT, CMS_LOGIN_DIALOG_PASSWORD); + gd = CmsUiUtils.fillWidth(); gd.widthHint = textWidth; passwordT.setLayoutData(gd); @@ -194,7 +194,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler { // Button Button loginButton = new Button(credentialsBlock, SWT.PUSH); loginButton.setText(CmsMsg.login.lead(locale)); - loginButton.setLayoutData(CmsUtils.fillWidth()); + loginButton.setLayoutData(CmsUiUtils.fillWidth()); loginButton.addSelectionListener(loginSelectionListener); extendsCredentialsBlock(credentialsBlock, locale, loginSelectionListener); @@ -229,9 +229,9 @@ public class CmsLogin implements CmsStyles, CallbackHandler { protected Composite createLocalesBlock(final Composite parent) { Composite c = new Composite(parent, SWT.NONE); - CmsUtils.style(c, CMS_USER_MENU_ITEM); - c.setLayout(CmsUtils.noSpaceGridLayout()); - c.setLayoutData(CmsUtils.fillAll()); + CmsUiUtils.style(c, CMS_USER_MENU_ITEM); + c.setLayout(CmsUiUtils.noSpaceGridLayout()); + c.setLayoutData(CmsUiUtils.fillAll()); SelectionListener selectionListener = new SelectionAdapter() { private static final long serialVersionUID = 4891637813567806762L; @@ -249,7 +249,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler { for (Integer i = 0; i < locales.size(); i++) { Locale locale = locales.get(i); Button button = new Button(c, SWT.RADIO); - CmsUtils.style(button, CMS_USER_MENU_ITEM); + CmsUiUtils.style(button, CMS_USER_MENU_ITEM); button.setData(i); button.setText(LocaleUtils.lead(locale.getDisplayName(locale), locale) + " (" + locale + ")"); // button.addListener(SWT.Selection, listener); diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLoginShell.java similarity index 91% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLoginShell.java index dea632de8..5460ffd0e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLoginShell.java @@ -1,7 +1,7 @@ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import org.argeo.cms.ui.CmsView; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; @@ -14,7 +14,7 @@ public class CmsLoginShell extends CmsLogin { public CmsLoginShell(CmsView cmsView) { super(cmsView); shell = createShell(); - CmsUtils.style(shell, CMS_USER_MENU); + CmsUiUtils.style(shell, CMS_USER_MENU); // createUi(shell); } diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CompositeCallbackHandler.java similarity index 99% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CompositeCallbackHandler.java index 1f72e23c1..974b6765b 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CompositeCallbackHandler.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import java.io.IOException; import java.util.Arrays; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/DefaultLoginDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/DefaultLoginDialog.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/DefaultLoginDialog.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/DefaultLoginDialog.java index b8de34b7c..10edbf318 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/DefaultLoginDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/DefaultLoginDialog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import javax.security.auth.callback.CallbackHandler; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/DynamicCallbackHandler.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/DynamicCallbackHandler.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/DynamicCallbackHandler.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/DynamicCallbackHandler.java index b2063555f..e470bda0b 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/DynamicCallbackHandler.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/DynamicCallbackHandler.java @@ -1,4 +1,4 @@ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import java.io.IOException; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/LocaleChoice.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/LocaleChoice.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/LocaleChoice.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/LocaleChoice.java index b3ae47df5..0c8031b9e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/LocaleChoice.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/LocaleChoice.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.cms.widgets.auth; +package org.argeo.cms.ui.widgets.auth; import java.util.Collections; import java.util.List; diff --git a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java index 44ef29d6a..893067f61 100644 --- a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java +++ b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java @@ -25,19 +25,19 @@ import javax.jcr.PropertyType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; +import org.argeo.api.tabular.TabularColumn; +import org.argeo.api.tabular.TabularRow; +import org.argeo.api.tabular.TabularRowIterator; +import org.argeo.api.tabular.TabularWriter; import org.argeo.cms.ArgeoTypes; import org.argeo.jackrabbit.unit.AbstractJackrabbitTestCase; -import org.argeo.node.tabular.TabularColumn; -import org.argeo.node.tabular.TabularRow; -import org.argeo.node.tabular.TabularRowIterator; -import org.argeo.node.tabular.TabularWriter; public class JcrTabularTest extends AbstractJackrabbitTestCase { private final static Log log = LogFactory.getLog(JcrTabularTest.class); public void testWriteReadCsv() throws Exception { // session().setNamespacePrefix("argeo", ArgeoNames.ARGEO_NAMESPACE); - InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/node/ldap.cnd")); + InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/api/ldap.cnd")); CndImporter.registerNodeTypes(reader, session()); reader.close(); reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/cms/argeo.cnd")); diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 69c833e9c..78cfb65bd 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -13,7 +13,7 @@ org.argeo.commons - org.argeo.node.api + org.argeo.api 2.1.88-SNAPSHOT diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java index ab40e720c..4d1fceb58 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -13,6 +13,10 @@ import javax.security.auth.x500.X500Principal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.AnonymousPrincipal; +import org.argeo.api.security.DataAdminPrincipal; +import org.argeo.api.security.NodeSecurityUtils; //import org.apache.jackrabbit.core.security.AnonymousPrincipal; //import org.apache.jackrabbit.core.security.SecurityConstants; //import org.apache.jackrabbit.core.security.principal.AdminPrincipal; @@ -21,10 +25,6 @@ import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; import org.argeo.cms.internal.http.WebCmsSessionImpl; import org.argeo.cms.internal.kernel.Activator; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.AnonymousPrincipal; -import org.argeo.node.security.DataAdminPrincipal; -import org.argeo.node.security.NodeSecurityUtils; import org.argeo.osgi.useradmin.AuthenticatingUser; import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java index 43bddaf8d..e1425015c 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java @@ -28,11 +28,11 @@ import java.util.UUID; import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; import org.argeo.cms.internal.kernel.Activator; -import org.argeo.node.NodeConstants; import org.osgi.service.useradmin.Authorization; /** diff --git a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java index 09fece03a..4a4151edc 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java @@ -30,7 +30,7 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.argeo.node.security.PBEKeySpecCallback; +import org.argeo.api.security.PBEKeySpecCallback; import org.argeo.util.PasswordEncryption; /** Adds a secret key to the private credentials */ diff --git a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java index 4d2cc3339..e3da327e6 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java @@ -16,10 +16,10 @@ import javax.security.auth.x500.X500Principal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.DataAdminPrincipal; import org.argeo.cms.internal.auth.ImpliedByPrincipal; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.DataAdminPrincipal; import org.argeo.osgi.useradmin.IpaUtils; public class SingleUserLoginModule implements LoginModule { diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java index 692d214bc..f7d426e26 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java @@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.CryptoKeyring; import org.argeo.cms.CmsException; import org.argeo.cms.internal.kernel.Activator; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.CryptoKeyring; import org.argeo.osgi.useradmin.AuthenticatingUser; import org.argeo.osgi.useradmin.IpaUtils; import org.argeo.osgi.useradmin.OsUserUtils; diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java index 326b0f4da..3dbc7ad52 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java @@ -6,9 +6,9 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; import org.osgi.service.useradmin.UserAdmin; diff --git a/org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java b/org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java deleted file mode 100644 index 78d717a20..000000000 --- a/org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.argeo.cms.i18n; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Enumeration; -import java.util.ResourceBundle; -import java.util.Vector; - -import org.argeo.cms.CmsException; - -/** Expose the default values as a {@link ResourceBundle} */ -@Deprecated -public class DefaultsResourceBundle extends ResourceBundle { - - @Override - protected Object handleGetObject(String key) { - Object obj; - try { - Field field = getClass().getField(key); - obj = field.getType().getMethod("getDefault") - .invoke(field.get(null)); - } catch (Exception e) { - throw new CmsException("Cannot get default for " + key, e); - } - return obj; - } - - @Override - public Enumeration getKeys() { - Vector res = new Vector(); - final Field[] fieldArray = getClass().getDeclaredFields(); - - for (Field field : fieldArray) { - if (Modifier.isStatic(field.getModifiers()) - && field.getType().isAssignableFrom(LocaleUtils.class)) { - res.add(field.getName()); - } - } - return res.elements(); - } - -} diff --git a/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java b/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java deleted file mode 100644 index 71a31413e..000000000 --- a/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.argeo.cms.i18n; - -import java.util.List; -import java.util.Locale; - -import org.argeo.cms.auth.CurrentUser; - -/** - * Utilities simplifying the development of localization enums. - * - * @deprecated Use {@link org.argeo.cms.LocaleUtils} - */ -@Deprecated -public class LocaleUtils { - public static Object local(Enum en) { - return org.argeo.cms.LocaleUtils.local(en); - } - - public static Object local(Enum en, Locale locale) { - return org.argeo.cms.LocaleUtils.local(en, locale); - } - - public static Object local(Enum en, Locale locale, String resource) { - return org.argeo.cms.LocaleUtils.local(en, locale, resource); - } - - public static Object local(Enum en, Locale locale, String resource, ClassLoader classLoader) { - return org.argeo.cms.LocaleUtils.local(en, locale, resource, classLoader); - } - - public static String lead(String raw, Locale locale) { - return org.argeo.cms.LocaleUtils.lead(raw, locale); - } - - public static String lead(Localized localized) { - return org.argeo.cms.LocaleUtils.lead(localized); - } - - public static String lead(Localized localized, Locale locale) { - return org.argeo.cms.LocaleUtils.lead(localized, locale); - } - - static Locale getCurrentLocale() { - return CurrentUser.locale(); - // return UiContext.getLocale(); - // FIXME look into Subject or settings - // return Locale.getDefault(); - } - - /** Returns null if argument is null. */ - public static List asLocaleList(Object locales) { - return org.argeo.cms.LocaleUtils.asLocaleList(locales); - } -} diff --git a/org.argeo.cms/src/org/argeo/cms/i18n/Localized.java b/org.argeo.cms/src/org/argeo/cms/i18n/Localized.java deleted file mode 100644 index 7d32193bf..000000000 --- a/org.argeo.cms/src/org/argeo/cms/i18n/Localized.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.argeo.cms.i18n; - -/** - * Localized object. - * - * @deprecated Use {@link org.argeo.cms.Localized} instead. - */ -@Deprecated -public interface Localized extends org.argeo.cms.Localized { -} diff --git a/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java b/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java index cb3a3484a..5bc13526c 100644 --- a/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java +++ b/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java @@ -16,10 +16,10 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.CmsSessionId; import org.argeo.cms.auth.HttpRequestCallback; import org.argeo.cms.auth.HttpRequestCallbackHandler; -import org.argeo.node.NodeConstants; import org.osgi.service.useradmin.Authorization; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/org.argeo.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java b/org.argeo.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java index 50967391c..bc37b5f4f 100644 --- a/org.argeo.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java +++ b/org.argeo.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java @@ -13,11 +13,11 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.CmsSessionId; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.HttpRequestCallback; import org.argeo.cms.auth.HttpRequestCallbackHandler; -import org.argeo.node.NodeConstants; /** Externally authenticate an http session. */ public class CmsLogoutServlet extends HttpServlet { diff --git a/org.argeo.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/org.argeo.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java index c968d779d..4c7c8997a 100644 --- a/org.argeo.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java +++ b/org.argeo.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java @@ -1,6 +1,6 @@ package org.argeo.cms.integration; -import static org.argeo.node.NodeConstants.LOGIN_CONTEXT_USER; +import static org.argeo.api.NodeConstants.LOGIN_CONTEXT_USER; import java.io.IOException; import java.security.AccessControlContext; diff --git a/org.argeo.cms/src/org/argeo/cms/integration/CmsTokenServlet.java b/org.argeo.cms/src/org/argeo/cms/integration/CmsTokenServlet.java index b2e5a7ed3..11a6944b2 100644 --- a/org.argeo.cms/src/org/argeo/cms/integration/CmsTokenServlet.java +++ b/org.argeo.cms/src/org/argeo/cms/integration/CmsTokenServlet.java @@ -15,11 +15,11 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsUserManager; import org.argeo.cms.auth.HttpRequestCallback; import org.argeo.cms.auth.HttpRequestCallbackHandler; import org.argeo.naming.NamingUtils; -import org.argeo.node.NodeConstants; import org.osgi.service.useradmin.Authorization; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java index ce38cf0ee..f8d5863e6 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java @@ -26,11 +26,11 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.NodeSecurityUtils; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CmsSession; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.NodeSecurityUtils; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java index 869dbb23c..d9b8f42d1 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java @@ -25,6 +25,7 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsUserManager; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; @@ -32,7 +33,6 @@ import org.argeo.jcr.JcrUtils; import org.argeo.naming.LdapAttrs; import org.argeo.naming.NamingUtils; import org.argeo.naming.SharedSecret; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.TokenUtils; import org.argeo.osgi.useradmin.UserAdminConf; import org.osgi.framework.InvalidSyntaxException; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/DataHttpContext.java b/org.argeo.cms/src/org/argeo/cms/internal/http/DataHttpContext.java index 93f63530e..df469524d 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/http/DataHttpContext.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/http/DataHttpContext.java @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.HttpRequestCallbackHandler; -import org.argeo.node.NodeConstants; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.service.http.HttpContext; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java b/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java index f9e17a107..f81f26f7a 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java @@ -25,10 +25,10 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java index b3ab11a33..872d8ae53 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java @@ -21,10 +21,10 @@ import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.cache.CacheManager; import org.apache.jackrabbit.core.config.RepositoryConfig; import org.apache.jackrabbit.core.config.RepositoryConfigurationParser; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.kernel.CmsPaths; import org.argeo.jcr.ArgeoJcrException; -import org.argeo.node.NodeConstants; import org.xml.sax.InputSource; /** Can interpret properties in order to create an actual JCR repository. */ diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java index 5728d4fa5..d2d7d25b7 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java @@ -15,13 +15,13 @@ import javax.security.auth.login.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.ArgeoLogger; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeDeployment; +import org.argeo.api.NodeInstance; +import org.argeo.api.NodeState; import org.argeo.cms.CmsException; import org.argeo.ident.IdentClient; -import org.argeo.node.ArgeoLogger; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeDeployment; -import org.argeo.node.NodeInstance; -import org.argeo.node.NodeState; import org.argeo.util.LangUtils; import org.ietf.jgss.GSSCredential; import org.osgi.framework.BundleActivator; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java index dc6459087..b81a81b3b 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java @@ -1,6 +1,6 @@ package org.argeo.cms.internal.kernel; -import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; +import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; import java.io.File; import java.io.InputStreamReader; @@ -26,15 +26,15 @@ import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; +import org.argeo.api.DataModelNamespace; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeDeployment; +import org.argeo.api.NodeState; +import org.argeo.api.security.CryptoKeyring; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.jcr.JcrUtils; -import org.argeo.node.DataModelNamespace; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeDeployment; -import org.argeo.node.NodeState; -import org.argeo.node.security.CryptoKeyring; -import org.argeo.node.security.Keyring; import org.argeo.osgi.useradmin.UserAdminConf; import org.argeo.util.LangUtils; import org.eclipse.equinox.http.jetty.JettyConfigurator; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java index 3304bb41d..dea21a2e7 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java @@ -16,14 +16,14 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.jackrabbit.fs.AbstractJackrabbitFsProvider; import org.argeo.jcr.fs.JcrFileSystem; import org.argeo.jcr.fs.JcrFileSystemProvider; import org.argeo.jcr.fs.JcrFsException; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java index c972f725c..1af4095ce 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java @@ -5,9 +5,9 @@ import javax.naming.ldap.LdapName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeInstance; import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeInstance; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java index 6c97fa141..ca469f0f5 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java @@ -15,10 +15,10 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeState; import org.argeo.cms.CmsException; import org.argeo.cms.LocaleUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeState; import org.argeo.transaction.simple.SimpleTransactionManager; import org.argeo.util.LangUtils; import org.osgi.framework.BundleContext; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java index 19117a892..acf0dbf7c 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java @@ -1,6 +1,6 @@ package org.argeo.cms.internal.kernel; -import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; +import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; import java.util.ArrayList; import java.util.Collections; @@ -10,8 +10,8 @@ import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.DataModelNamespace; import org.argeo.cms.CmsException; -import org.argeo.node.DataModelNamespace; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java index d52fe663b..9d2925948 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java @@ -20,13 +20,13 @@ import javax.websocket.server.ServerEndpointConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.http.InternalHttpConstants; import org.argeo.cms.websocket.CmsWebSocketConfigurator; import org.argeo.naming.AttributesDictionary; import org.argeo.naming.LdifParser; import org.argeo.naming.LdifWriter; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.UserAdminConf; import org.eclipse.equinox.http.jetty.JettyConfigurator; import org.osgi.framework.BundleContext; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java index 9c5e5f5f7..375175bb1 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java @@ -17,11 +17,11 @@ import javax.naming.ldap.LdapName; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; import org.argeo.cms.CmsException; import org.argeo.jcr.JcrRepositoryWrapper; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; /** * Make sure each user has a home directory available. diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java index 6eaebeb64..390131aa7 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java @@ -21,10 +21,10 @@ import javax.security.auth.x500.X500Principal; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.http.InternalHttpConstants; import org.argeo.cms.internal.jcr.RepoConf; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.UserAdminConf; /** diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java index c59a599f1..35575de1d 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java @@ -9,7 +9,7 @@ import javax.jcr.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.core.RepositoryImpl; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; class JackrabbitLocalRepository extends LocalRepository { private final static Log log = LogFactory.getLog(JackrabbitLocalRepository.class); diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java index 13ff4b8b2..8fa7779f9 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java @@ -1,6 +1,6 @@ package org.argeo.cms.internal.kernel; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; public interface KernelConstants { String[] DEFAULT_CNDS = { "/org/argeo/jcr/argeo.cnd", "/org/argeo/cms/cms.cnd" }; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java index 86289f0ff..bf8e8d38e 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java @@ -24,9 +24,9 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; +import org.argeo.api.DataModelNamespace; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; -import org.argeo.node.DataModelNamespace; -import org.argeo.node.NodeConstants; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/LocalRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/LocalRepository.java index 4356d18ff..fd085e214 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/LocalRepository.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/LocalRepository.java @@ -2,8 +2,8 @@ package org.argeo.cms.internal.kernel; import javax.jcr.Repository; +import org.argeo.api.NodeConstants; import org.argeo.jcr.JcrRepositoryWrapper; -import org.argeo.node.NodeConstants; class LocalRepository extends JcrRepositoryWrapper { private final String cn; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java index 3174285db..ea764c3fb 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java @@ -15,6 +15,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.server.SessionProvider; import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet; import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.http.CmsSessionProvider; import org.argeo.cms.internal.http.DataHttpContext; @@ -22,7 +23,6 @@ import org.argeo.cms.internal.http.HttpUtils; import org.argeo.cms.internal.http.LinkServlet; import org.argeo.cms.internal.http.PrivateHttpContext; import org.argeo.cms.internal.http.RobotServlet; -import org.argeo.node.NodeConstants; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java index 947d4d89e..1d296c5b9 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java @@ -46,11 +46,11 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.spi.LoggingEvent; +import org.argeo.api.ArgeoLogListener; +import org.argeo.api.ArgeoLogger; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; -import org.argeo.node.ArgeoLogListener; -import org.argeo.node.ArgeoLogger; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.UserAdminConf; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java index ae6623826..47e8b5cd5 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java @@ -28,9 +28,9 @@ import javax.jcr.RepositoryFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.jcr2dav.Jcr2davRepositoryFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.internal.jcr.RepoConf; import org.argeo.jcr.ArgeoJcrException; -import org.argeo.node.NodeConstants; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java index ba4ad8360..cb80f7c7f 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java @@ -34,11 +34,11 @@ import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.params.HttpParams; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.http.client.HttpCredentialProvider; import org.argeo.cms.internal.http.client.SpnegoAuthScheme; import org.argeo.naming.DnsBrowser; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.AbstractUserDirectory; import org.argeo.osgi.useradmin.AggregatingUserAdmin; import org.argeo.osgi.useradmin.LdapUserAdmin; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java index be99bf20e..a06b12bbd 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java @@ -11,10 +11,10 @@ import javax.jcr.RepositoryFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.core.RepositoryContext; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.internal.jcr.RepoConf; import org.argeo.cms.internal.jcr.RepositoryBuilder; -import org.argeo.node.NodeConstants; import org.argeo.util.LangUtils; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/SecurityProfile.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/SecurityProfile.java index 9e6e3b96b..127cb9a8a 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/SecurityProfile.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/SecurityProfile.java @@ -8,7 +8,7 @@ import java.util.PropertyPermission; import javax.security.auth.AuthPermission; -import org.argeo.node.NodeUtils; +import org.argeo.api.NodeUtils; import org.osgi.framework.AdminPermission; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas-ipa.cfg b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas-ipa.cfg index 1d43afd9a..b9f05a4ab 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas-ipa.cfg +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas-ipa.cfg @@ -11,7 +11,7 @@ ANONYMOUS { }; DATA_ADMIN { - org.argeo.node.DataAdminLoginModule requisite; + org.argeo.api.DataAdminLoginModule requisite; }; NODE { @@ -19,7 +19,7 @@ NODE { keyTab="${osgi.instance.area}node/krb5.keytab" useKeyTab=true storeKey=true; - org.argeo.node.DataAdminLoginModule requisite; + org.argeo.api.DataAdminLoginModule requisite; }; KEYRING { diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg index e54277a3c..9a59613e9 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg @@ -10,11 +10,11 @@ ANONYMOUS { }; DATA_ADMIN { - org.argeo.node.DataAdminLoginModule requisite; + org.argeo.api.DataAdminLoginModule requisite; }; NODE { - org.argeo.node.DataAdminLoginModule requisite; + org.argeo.api.DataAdminLoginModule requisite; }; KEYRING { diff --git a/org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java b/org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java index 779406a1d..0e356edf7 100644 --- a/org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java +++ b/org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java @@ -41,11 +41,11 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import org.apache.commons.io.IOUtils; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.CryptoKeyring; +import org.argeo.api.security.Keyring; +import org.argeo.api.security.PBEKeySpecCallback; import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.CryptoKeyring; -import org.argeo.node.security.Keyring; -import org.argeo.node.security.PBEKeySpecCallback; /** username / password based keyring. TODO internationalize */ public abstract class AbstractKeyring implements Keyring, CryptoKeyring { diff --git a/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java b/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java index c75d38fc8..45b7c4beb 100644 --- a/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java +++ b/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java @@ -41,14 +41,14 @@ import javax.jcr.query.Query; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.PBEKeySpecCallback; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.CmsException; import org.argeo.jcr.ArgeoJcrException; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.PBEKeySpecCallback; /** JCR based implementation of a keyring */ public class JcrKeyring extends AbstractKeyring implements ArgeoNames { diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/CsvTabularWriter.java b/org.argeo.cms/src/org/argeo/cms/tabular/CsvTabularWriter.java index d22f44e73..f4b53f875 100644 --- a/org.argeo.cms/src/org/argeo/cms/tabular/CsvTabularWriter.java +++ b/org.argeo.cms/src/org/argeo/cms/tabular/CsvTabularWriter.java @@ -17,7 +17,7 @@ package org.argeo.cms.tabular; import java.io.OutputStream; -import org.argeo.node.tabular.TabularWriter; +import org.argeo.api.tabular.TabularWriter; import org.argeo.util.CsvWriter; /** Write tabular content in a stream as CSV. Wraps a {@link CsvWriter}. */ diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularRowIterator.java b/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularRowIterator.java index 04dce92c8..c13d62244 100644 --- a/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularRowIterator.java +++ b/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularRowIterator.java @@ -28,12 +28,12 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; +import org.argeo.api.tabular.ArrayTabularRow; +import org.argeo.api.tabular.TabularColumn; +import org.argeo.api.tabular.TabularRow; +import org.argeo.api.tabular.TabularRowIterator; import org.argeo.cms.ArgeoTypes; import org.argeo.jcr.ArgeoJcrException; -import org.argeo.node.tabular.ArrayTabularRow; -import org.argeo.node.tabular.TabularColumn; -import org.argeo.node.tabular.TabularRow; -import org.argeo.node.tabular.TabularRowIterator; import org.argeo.util.CsvParser; /** Iterates over the rows of a {@link ArgeoTypes#ARGEO_TABLE} node. */ diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java b/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java index a6e1e286c..e581e2b35 100644 --- a/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java +++ b/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java @@ -27,11 +27,11 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; +import org.argeo.api.tabular.TabularColumn; +import org.argeo.api.tabular.TabularWriter; import org.argeo.cms.ArgeoTypes; import org.argeo.jcr.ArgeoJcrException; import org.argeo.jcr.JcrUtils; -import org.argeo.node.tabular.TabularColumn; -import org.argeo.node.tabular.TabularWriter; import org.argeo.util.CsvWriter; /** Write / reference tabular content in a JCR repository. */ diff --git a/org.argeo.cms/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java b/org.argeo.cms/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java index f72527af1..652f25298 100644 --- a/org.argeo.cms/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java +++ b/org.argeo.cms/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java @@ -15,8 +15,8 @@ import javax.websocket.server.ServerEndpointConfig.Configurator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.HttpRequestCallbackHandler; -import org.argeo.node.NodeConstants; import org.osgi.service.http.context.ServletContextHelper; /** Customises the initialisation of a new web socket. */ diff --git a/org.argeo.eclipse.ui.rap/bnd.bnd b/org.argeo.eclipse.ui.rap/bnd.bnd index 0b6fdb5ef..fb50c88ef 100644 --- a/org.argeo.eclipse.ui.rap/bnd.bnd +++ b/org.argeo.eclipse.ui.rap/bnd.bnd @@ -1,5 +1,5 @@ Import-Package: org.eclipse.swt,\ org.eclipse.jface.dialogs,\ -org.argeo.eclipse.ui.utils,\ +org.argeo.eclipse.ui.util,\ org.eclipse.swt.events,\ * diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java index efc07337d..3a12c522b 100644 --- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java +++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java @@ -18,7 +18,7 @@ package org.argeo.eclipse.ui.specific; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.eclipse.ui.utils.SingleSourcingConstants; +import org.argeo.eclipse.ui.util.SingleSourcingConstants; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.rap.rwt.RWT; diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java index a181a2993..4a75cc1f6 100644 --- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java +++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java @@ -15,8 +15,8 @@ */ package org.argeo.eclipse.ui.specific; -import static org.argeo.eclipse.ui.utils.SingleSourcingConstants.FILE_SCHEME; -import static org.argeo.eclipse.ui.utils.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; +import static org.argeo.eclipse.ui.util.SingleSourcingConstants.FILE_SCHEME; +import static org.argeo.eclipse.ui.util.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; import java.io.IOException; import java.nio.file.Files; @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.eclipse.ui.utils.SingleSourcingConstants; +import org.argeo.eclipse.ui.util.SingleSourcingConstants; import org.eclipse.rap.rwt.service.ServiceHandler; /** diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java rename to org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java index 472101f34..88006ff93 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.utils; +package org.argeo.eclipse.ui.jcr.util; import java.io.InputStream; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java similarity index 96% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java rename to org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java index 015670ba5..3fb1308e4 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.utils; +package org.argeo.eclipse.ui.jcr.util; import java.util.Comparator; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java similarity index 97% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java rename to org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java index db8ca0866..5111f7a56 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.utils; +package org.argeo.eclipse.ui.jcr.util; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java similarity index 98% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java rename to org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java index 05754d024..16f4d9a03 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.utils; +package org.argeo.eclipse.ui.jcr.util; import java.io.InputStream; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java index d6dc82cef..57139056c 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java @@ -6,7 +6,7 @@ import java.util.List; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.eclipse.ui.utils.ViewerUtils; +import org.argeo.eclipse.ui.util.ViewerUtils; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ColumnLabelProvider; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/SingleSourcingConstants.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java similarity index 92% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/SingleSourcingConstants.java rename to org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java index a45eeda4f..b99f37a72 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/SingleSourcingConstants.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/SingleSourcingConstants.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.utils; +package org.argeo.eclipse.ui.util; /** * Centralise constants that are used in both RAP and RCP specific code to avoid diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/ViewerUtils.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/ViewerUtils.java similarity index 98% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/ViewerUtils.java rename to org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/ViewerUtils.java index 3c029d350..dbebb790c 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/ViewerUtils.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/util/ViewerUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.utils; +package org.argeo.eclipse.ui.util; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; diff --git a/org.argeo.ext.equinox.jetty/bnd.bnd b/org.argeo.ext.equinox.jetty/bnd.bnd index 3422e55e7..c114be661 100644 --- a/org.argeo.ext.equinox.jetty/bnd.bnd +++ b/org.argeo.ext.equinox.jetty/bnd.bnd @@ -5,5 +5,5 @@ org.eclipse.jetty.websocket.api,\ org.eclipse.jetty.websocket.common,\ org.osgi.service.http,\ org.argeo.cms.auth,\ -org.argeo.node,\ +org.argeo.api,\ * \ No newline at end of file diff --git a/org.argeo.ext.jackrabbit/bnd.bnd b/org.argeo.ext.jackrabbit/bnd.bnd index 3dbc51f9c..7893b81d9 100644 --- a/org.argeo.ext.jackrabbit/bnd.bnd +++ b/org.argeo.ext.jackrabbit/bnd.bnd @@ -1,3 +1,3 @@ Fragment-Host: org.apache.jackrabbit.core -Import-Package: org.argeo.node,\ +Import-Package: org.argeo.api,\ * diff --git a/org.argeo.ext.jackrabbit/pom.xml b/org.argeo.ext.jackrabbit/pom.xml index 65d5134bc..d8a529de8 100644 --- a/org.argeo.ext.jackrabbit/pom.xml +++ b/org.argeo.ext.jackrabbit/pom.xml @@ -12,7 +12,7 @@ org.argeo.commons - org.argeo.node.api + org.argeo.api 2.1.88-SNAPSHOT diff --git a/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java index 36401596f..3976f3ba9 100644 --- a/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java +++ b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java @@ -37,10 +37,10 @@ import org.apache.jackrabbit.core.security.SystemPrincipal; import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager; import org.apache.jackrabbit.core.security.principal.AdminPrincipal; import org.apache.jackrabbit.core.security.principal.PrincipalProvider; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.AnonymousPrincipal; +import org.argeo.api.security.DataAdminPrincipal; import org.argeo.cms.auth.CmsSession; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.AnonymousPrincipal; -import org.argeo.node.security.DataAdminPrincipal; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java index f7de8d003..4b7734623 100644 --- a/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java +++ b/org.argeo.ext.jackrabbit/src/org/argeo/security/jackrabbit/SystemJackrabbitLoginModule.java @@ -12,7 +12,7 @@ import javax.security.auth.x500.X500Principal; import org.apache.jackrabbit.core.security.AnonymousPrincipal; import org.apache.jackrabbit.core.security.SecurityConstants; import org.apache.jackrabbit.core.security.principal.AdminPrincipal; -import org.argeo.node.security.DataAdminPrincipal; +import org.argeo.api.security.DataAdminPrincipal; public class SystemJackrabbitLoginModule implements LoginModule { private Subject subject; @@ -30,7 +30,7 @@ public class SystemJackrabbitLoginModule implements LoginModule { @Override public boolean commit() throws LoginException { - Set anonPrincipal = subject.getPrincipals(org.argeo.node.security.AnonymousPrincipal.class); + Set anonPrincipal = subject.getPrincipals(org.argeo.api.security.AnonymousPrincipal.class); if (!anonPrincipal.isEmpty()) { subject.getPrincipals().add(new AnonymousPrincipal()); return true; diff --git a/org.argeo.maintenance/pom.xml b/org.argeo.maintenance/pom.xml index a51b73c2b..b65148668 100644 --- a/org.argeo.maintenance/pom.xml +++ b/org.argeo.maintenance/pom.xml @@ -23,7 +23,7 @@ org.argeo.commons - org.argeo.node.api + org.argeo.api 2.1.88-SNAPSHOT diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java b/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java index 6755a647a..c756bd8e0 100644 --- a/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java +++ b/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java @@ -13,10 +13,10 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; import org.argeo.naming.Distinguished; -import org.argeo.node.NodeUtils; import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin; diff --git a/org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalBackup.java b/org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalBackup.java index 6d1016a06..a292dcf23 100644 --- a/org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalBackup.java +++ b/org.argeo.maintenance/src/org/argeo/maintenance/backup/LogicalBackup.java @@ -31,8 +31,8 @@ import javax.jcr.Session; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeUtils; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.xml.sax.SAXException; diff --git a/org.argeo.util/src/org/argeo/util/test/Tester.java b/org.argeo.util/src/org/argeo/util/Tester.java similarity index 99% rename from org.argeo.util/src/org/argeo/util/test/Tester.java rename to org.argeo.util/src/org/argeo/util/Tester.java index 36e27de72..31a2be4ec 100644 --- a/org.argeo.util/src/org/argeo/util/test/Tester.java +++ b/org.argeo.util/src/org/argeo/util/Tester.java @@ -1,4 +1,4 @@ -package org.argeo.util.test; +package org.argeo.util; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/org.argeo.util/src/org/argeo/util/test/TesterStatus.java b/org.argeo.util/src/org/argeo/util/TesterStatus.java similarity index 98% rename from org.argeo.util/src/org/argeo/util/test/TesterStatus.java rename to org.argeo.util/src/org/argeo/util/TesterStatus.java index d533e9457..d1d14ed06 100644 --- a/org.argeo.util/src/org/argeo/util/test/TesterStatus.java +++ b/org.argeo.util/src/org/argeo/util/TesterStatus.java @@ -1,4 +1,4 @@ -package org.argeo.util.test; +package org.argeo.util; import java.io.Serializable; diff --git a/pom.xml b/pom.xml index 713a3916b..ed1b7d167 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.argeo.eclipse.ui org.argeo.eclipse.ui.rap - org.argeo.node.api + org.argeo.api org.argeo.maintenance org.argeo.cms org.argeo.cms.ui.theme @@ -195,7 +195,7 @@ limitations under the License. false -Xdoclint:none - *.internal.*,org.eclipse.* + *.internal.*,org.eclipse.*,org.argeo.cms.ui.eclipse.forms.* UTF-8 true -- 2.30.2