From c5fa035468228d1f87ab5431a3fad17403eee1c3 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Thu, 15 Sep 2016 11:45:36 +0000 Subject: [PATCH] Move UI classes to cms.ui git-svn-id: https://svn.argeo.org/commons/trunk@9159 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/cms/forms/FormEditorHeader.java | 2 +- .../org/argeo/cms/forms/FormPageViewer.java | 4 +- .../src/org/argeo/cms/forms/FormUtils.java | 2 +- .../src/org/argeo/cms/maintenance/Browse.java | 2 +- .../argeo/cms/maintenance/NonAdminPage.java | 2 +- .../org/argeo/cms/text/CustomTextEditor.java | 2 +- .../src/org/argeo/cms/text/Img.java | 2 +- .../argeo/cms/text/StandardTextEditor.java | 2 +- .../org/argeo/cms/text/TextEditorHeader.java | 2 +- .../src/org/argeo/cms/text/WikiPage.java | 4 +- .../argeo/cms/ui}/AbstractCmsEntryPoint.java | 3 +- .../src/org/argeo/cms/ui}/CmsConstants.java | 2 +- .../src/org/argeo/cms/ui}/CmsEditable.java | 2 +- .../org/argeo/cms/ui}/CmsEditionEvent.java | 2 +- .../org/argeo/cms/ui}/CmsImageManager.java | 2 +- .../src/org/argeo/cms/ui}/CmsStyles.java | 2 +- .../src/org/argeo/cms/ui}/CmsUiProvider.java | 2 +- .../src/org/argeo/cms/ui}/CmsView.java | 2 +- .../argeo/cms/ui}/LifeCycleUiProvider.java | 2 +- .../src/org/argeo/cms/ui}/UxContext.java | 2 +- .../org/argeo/cms/ui/internal/Activator.java | 2 +- .../cms/ui/internal/ImageManagerImpl.java | 4 +- .../ui/internal/JcrFileUploadReceiver.java | 2 +- .../ui/internal/text/AbstractTextViewer.java | 4 +- .../src/org/argeo/cms/util/CmsLink.java | 4 +- .../src/org/argeo/cms/util/CmsUtils.java | 4 +- .../org/argeo/cms/util/LoginEntryPoint.java | 6 +- .../src/org/argeo/cms/util/MenuLink.java | 2 +- .../src/org/argeo/cms/util/SimpleApp.java | 6 +- .../org/argeo/cms/util/SimpleCmsHeader.java | 4 +- .../argeo/cms/util/SimpleDynamicPages.java | 2 +- .../org/argeo/cms/util/SimpleErgonomics.java | 10 +-- .../org/argeo/cms/util/SimpleStaticPage.java | 4 +- .../org/argeo/cms/util/SimpleUxContext.java | 2 +- .../argeo/cms/util/SystemNotifications.java | 2 +- .../src/org/argeo/cms/util/UserMenuLink.java | 2 +- .../cms/util/useradmin/UserAdminUtils.java | 2 +- .../argeo/cms/viewers/AbstractPageViewer.java | 2 +- .../cms/viewers/JcrVersionCmsEditable.java | 4 +- .../org/argeo/cms/widgets/StyledControl.java | 2 +- .../org/argeo/cms/widgets/auth/CmsLogin.java | 4 +- .../argeo/cms/widgets/auth/CmsLoginShell.java | 2 +- .../src/org/argeo/cms/CmsExtension.java | 19 ----- .../src/org/argeo/cms/DataMigration.java | 18 ----- .../internal/backup/RepositoryMigration.java | 69 ------------------- 45 files changed, 61 insertions(+), 166 deletions(-) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/AbstractCmsEntryPoint.java (99%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsConstants.java (96%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsEditable.java (95%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsEditionEvent.java (94%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsImageManager.java (98%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsStyles.java (97%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsUiProvider.java (95%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/CmsView.java (94%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/LifeCycleUiProvider.java (91%) rename {org.argeo.cms/src/org/argeo/cms => org.argeo.cms.ui/src/org/argeo/cms/ui}/UxContext.java (82%) delete mode 100644 org.argeo.cms/src/org/argeo/cms/CmsExtension.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/DataMigration.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/internal/backup/RepositoryMigration.java diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java index c12e2f000..92ce9da0c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormEditorHeader.java @@ -5,7 +5,7 @@ import java.util.Observer; import javax.jcr.Node; -import org.argeo.cms.CmsEditable; +import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java index 8526fcaca..afc7cb15b 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java @@ -16,11 +16,11 @@ import javax.jcr.ValueFormatException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsImageManager; import org.argeo.cms.CmsNames; import org.argeo.cms.text.Img; +import org.argeo.cms.ui.CmsEditable; +import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.internal.text.MarkupValidatorCopy; import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.AbstractPageViewer; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java index f8d08b08d..d0fa9269c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormUtils.java @@ -12,7 +12,7 @@ import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsView; +import org.argeo.cms.ui.CmsView; import org.argeo.cms.util.CmsUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.jface.fieldassist.ControlDecoration; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java b/org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java index 7dafd72c4..0389205ca 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/maintenance/Browse.java @@ -18,8 +18,8 @@ import javax.jcr.Value; import org.argeo.cms.CmsException; import org.argeo.cms.CmsTypes; -import org.argeo.cms.CmsUiProvider; import org.argeo.cms.text.Img; +import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.util.CmsLink; import org.argeo.cms.util.CmsUtils; import org.argeo.cms.widgets.EditableImage; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java b/org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java index b27d50659..8a903448f 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/maintenance/NonAdminPage.java @@ -3,7 +3,7 @@ package org.argeo.cms.maintenance; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsUiProvider; +import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/text/CustomTextEditor.java b/org.argeo.cms.ui/src/org/argeo/cms/text/CustomTextEditor.java index c7491e02c..442ad7815 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/text/CustomTextEditor.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/text/CustomTextEditor.java @@ -5,7 +5,7 @@ import static org.argeo.cms.util.CmsUtils.fillWidth; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsEditable; +import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.ui.internal.text.AbstractTextViewer; import org.argeo.cms.viewers.Section; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/text/Img.java b/org.argeo.cms.ui/src/org/argeo/cms/text/Img.java index e0cf21624..12f65f35e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/text/Img.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/text/Img.java @@ -4,7 +4,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsImageManager; +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; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/text/StandardTextEditor.java b/org.argeo.cms.ui/src/org/argeo/cms/text/StandardTextEditor.java index 3d1dc3f6f..f39317ac2 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/text/StandardTextEditor.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/text/StandardTextEditor.java @@ -6,8 +6,8 @@ import javax.jcr.Node; import javax.jcr.Property; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsTypes; +import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.ui.internal.text.AbstractTextViewer; import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.Section; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/text/TextEditorHeader.java b/org.argeo.cms.ui/src/org/argeo/cms/text/TextEditorHeader.java index e70a4d06e..5ae053683 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/text/TextEditorHeader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/text/TextEditorHeader.java @@ -3,7 +3,7 @@ package org.argeo.cms.text; import java.util.Observable; import java.util.Observer; -import org.argeo.cms.CmsEditable; +import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/text/WikiPage.java b/org.argeo.cms.ui/src/org/argeo/cms/text/WikiPage.java index 38af381a5..a01cc3551 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/text/WikiPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/text/WikiPage.java @@ -6,10 +6,10 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; -import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsNames; import org.argeo.cms.CmsTypes; -import org.argeo.cms.CmsUiProvider; +import org.argeo.cms.ui.CmsEditable; +import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.util.CmsLink; import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.JcrVersionCmsEditable; diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java similarity index 99% rename from org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java index 2632a1409..4729c5b75 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import java.security.PrivilegedAction; import java.util.HashMap; @@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.cms.CmsException; import org.argeo.cms.auth.AuthConstants; import org.argeo.cms.auth.HttpRequestCallbackHandler; import org.argeo.eclipse.ui.specific.UiContext; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsConstants.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsConstants.java similarity index 96% rename from org.argeo.cms/src/org/argeo/cms/CmsConstants.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsConstants.java index 6f21b57c8..dcbc02487 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsConstants.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsConstants.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.graphics.Point; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsEditable.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsEditable.java similarity index 95% rename from org.argeo.cms/src/org/argeo/cms/CmsEditable.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsEditable.java index 3c666ff30..687e3e83b 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsEditable.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsEditable.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; /** API NOT STABLE (yet). */ public interface CmsEditable { diff --git a/org.argeo.cms/src/org/argeo/cms/CmsEditionEvent.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsEditionEvent.java similarity index 94% rename from org.argeo.cms/src/org/argeo/cms/CmsEditionEvent.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsEditionEvent.java index 920f6d937..872142bca 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsEditionEvent.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsEditionEvent.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import java.util.EventObject; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsImageManager.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsImageManager.java similarity index 98% rename from org.argeo.cms/src/org/argeo/cms/CmsImageManager.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsImageManager.java index 2577dc777..ddae6006e 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsImageManager.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsImageManager.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import java.io.InputStream; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsStyles.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsStyles.java similarity index 97% rename from org.argeo.cms/src/org/argeo/cms/CmsStyles.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsStyles.java index 69ce8107d..2df1ea031 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsStyles.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsStyles.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; /** Styles references in the CSS. */ public interface CmsStyles { diff --git a/org.argeo.cms/src/org/argeo/cms/CmsUiProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java similarity index 95% rename from org.argeo.cms/src/org/argeo/cms/CmsUiProvider.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java index 27799b09d..7e0e4faf3 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsUiProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiProvider.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsView.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsView.java similarity index 94% rename from org.argeo.cms/src/org/argeo/cms/CmsView.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/CmsView.java index ad4796e22..8ef468a70 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsView.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsView.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import javax.security.auth.login.LoginContext; diff --git a/org.argeo.cms/src/org/argeo/cms/LifeCycleUiProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/LifeCycleUiProvider.java similarity index 91% rename from org.argeo.cms/src/org/argeo/cms/LifeCycleUiProvider.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/LifeCycleUiProvider.java index bb64b649d..5d77c156c 100644 --- a/org.argeo.cms/src/org/argeo/cms/LifeCycleUiProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/LifeCycleUiProvider.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; import javax.jcr.RepositoryException; import javax.jcr.Session; diff --git a/org.argeo.cms/src/org/argeo/cms/UxContext.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/UxContext.java similarity index 82% rename from org.argeo.cms/src/org/argeo/cms/UxContext.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/UxContext.java index b6674b99b..f03b88bbb 100644 --- a/org.argeo.cms/src/org/argeo/cms/UxContext.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/UxContext.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.ui; public interface UxContext { boolean isPortrait(); 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 ffc162b0f..052762ec0 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,7 +1,7 @@ package org.argeo.cms.ui.internal; -import org.argeo.cms.CmsStyles; import org.argeo.cms.maintenance.MaintenanceUi; +import org.argeo.cms.ui.CmsStyles; import org.argeo.cms.ui.internal.rwt.UserUi; import org.argeo.node.NodeState; import org.argeo.util.LangUtils; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/ImageManagerImpl.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/ImageManagerImpl.java index 92f237a4c..855446284 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/ImageManagerImpl.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/ImageManagerImpl.java @@ -4,8 +4,8 @@ import static javax.jcr.Node.JCR_CONTENT; import static javax.jcr.Property.JCR_DATA; import static javax.jcr.nodetype.NodeType.NT_FILE; import static javax.jcr.nodetype.NodeType.NT_RESOURCE; -import static org.argeo.cms.CmsConstants.NO_IMAGE_SIZE; import static org.argeo.cms.CmsTypes.CMS_STYLED; +import static org.argeo.cms.ui.CmsConstants.NO_IMAGE_SIZE; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -21,9 +21,9 @@ 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.CmsImageManager; import org.argeo.cms.CmsNames; import org.argeo.cms.CmsTypes; +import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.util.CmsUtils; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java index 2b157eb61..47eb191f9 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java @@ -12,8 +12,8 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsImageManager; import org.argeo.cms.CmsNames; +import org.argeo.cms.ui.CmsImageManager; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.fileupload.FileDetails; import org.eclipse.rap.fileupload.FileUploadReceiver; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/text/AbstractTextViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/text/AbstractTextViewer.java index c4b6060f9..aabf68564 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/text/AbstractTextViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/text/AbstractTextViewer.java @@ -18,15 +18,15 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsImageManager; import org.argeo.cms.CmsNames; import org.argeo.cms.CmsTypes; import org.argeo.cms.text.Img; import org.argeo.cms.text.Paragraph; import org.argeo.cms.text.TextInterpreter; import org.argeo.cms.text.TextSection; +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; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java index 01b1fde2f..3778515dc 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java @@ -10,8 +10,8 @@ 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.CmsStyles; -import org.argeo.cms.CmsUiProvider; +import org.argeo.cms.ui.CmsStyles; +import org.argeo.cms.ui.CmsUiProvider; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java index 5ebfeb831..a19081062 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java @@ -13,10 +13,10 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsConstants; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsView; import org.argeo.cms.auth.AuthConstants; +import org.argeo.cms.ui.CmsConstants; +import org.argeo.cms.ui.CmsView; import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.JcrUtils; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java index 2dea8d3f7..424b8b23c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java @@ -9,12 +9,12 @@ import javax.security.auth.login.LoginException; import javax.servlet.http.HttpServletRequest; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsImageManager; -import org.argeo.cms.CmsView; -import org.argeo.cms.UxContext; import org.argeo.cms.auth.AuthConstants; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.HttpRequestCallbackHandler; +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.eclipse.ui.specific.UiContext; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java b/org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java index d491d3ca2..c91674d7b 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/MenuLink.java @@ -1,6 +1,6 @@ package org.argeo.cms.util; -import org.argeo.cms.CmsStyles; +import org.argeo.cms.ui.CmsStyles; /** * Convenience class setting the custom style {@link CmsStyles#CMS_MENU_LINK} on diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java index 39e75070b..a0dc73262 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java @@ -18,10 +18,10 @@ import javax.jcr.version.VersionManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsConstants; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.LifeCycleUiProvider; +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.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.Application; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java index aa1bb7340..3f79c7fff 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleCmsHeader.java @@ -7,8 +7,8 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsStyles; -import org.argeo.cms.CmsUiProvider; +import org.argeo.cms.ui.CmsStyles; +import org.argeo.cms.ui.CmsUiProvider; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java index b6155cf31..dd95e7f35 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleDynamicPages.java @@ -12,7 +12,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsUiProvider; +import org.argeo.cms.ui.CmsUiProvider; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java index 8ada61fdf..620bc5302 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java @@ -7,12 +7,12 @@ import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.AbstractCmsEntryPoint; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsImageManager; -import org.argeo.cms.CmsStyles; -import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.UxContext; +import org.argeo.cms.ui.AbstractCmsEntryPoint; +import org.argeo.cms.ui.CmsImageManager; +import org.argeo.cms.ui.CmsStyles; +import org.argeo.cms.ui.CmsUiProvider; +import org.argeo.cms.ui.UxContext; import org.argeo.cms.ui.internal.ImageManagerImpl; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java index 6e09000e9..8ac3e963a 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleStaticPage.java @@ -3,8 +3,8 @@ package org.argeo.cms.util; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsStyles; -import org.argeo.cms.CmsUiProvider; +import org.argeo.cms.ui.CmsStyles; +import org.argeo.cms.ui.CmsUiProvider; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java index c5a6e6f4c..6cb37bde4 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleUxContext.java @@ -1,6 +1,6 @@ package org.argeo.cms.util; -import org.argeo.cms.UxContext; +import org.argeo.cms.ui.UxContext; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java index 54e8eb544..5fa79a331 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SystemNotifications.java @@ -9,7 +9,7 @@ import java.util.Date; import org.apache.commons.io.IOUtils; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsStyles; +import org.argeo.cms.ui.CmsStyles; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java b/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java index 1b7ca03f4..f7c9a7c8f 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java @@ -4,9 +4,9 @@ import javax.jcr.Node; import javax.security.auth.Subject; import org.argeo.cms.CmsMsg; -import org.argeo.cms.CmsStyles; import org.argeo.cms.auth.AuthConstants; import org.argeo.cms.auth.CurrentUser; +import org.argeo.cms.ui.CmsStyles; 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/useradmin/UserAdminUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/useradmin/UserAdminUtils.java index 9ccc3057f..953eb02c3 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/useradmin/UserAdminUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/useradmin/UserAdminUtils.java @@ -11,9 +11,9 @@ import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsView; import org.argeo.cms.auth.AuthConstants; import org.argeo.cms.auth.CurrentUser; +import org.argeo.cms.ui.CmsView; import org.argeo.cms.util.CmsUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java index b52f76be5..31d54c00c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/viewers/AbstractPageViewer.java @@ -9,8 +9,8 @@ import javax.jcr.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsException; +import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.widgets.ScrolledPage; import org.eclipse.jface.viewers.ContentViewer; import org.eclipse.jface.viewers.ISelection; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java b/org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java index 2d7daae59..bc3166307 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/viewers/JcrVersionCmsEditable.java @@ -8,9 +8,9 @@ import javax.jcr.Session; import javax.jcr.nodetype.NodeType; import javax.jcr.version.VersionManager; -import org.argeo.cms.CmsEditable; -import org.argeo.cms.CmsEditionEvent; import org.argeo.cms.CmsException; +import org.argeo.cms.ui.CmsEditable; +import org.argeo.cms.ui.CmsEditionEvent; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java index ec1dbe77e..210318995 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java @@ -3,8 +3,8 @@ package org.argeo.cms.widgets; import javax.jcr.Item; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsConstants; import org.argeo.cms.CmsNames; +import org.argeo.cms.ui.CmsConstants; import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusListener; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java index 21f101aea..c8b1fcfd6 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java @@ -23,11 +23,11 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsMsg; -import org.argeo.cms.CmsStyles; -import org.argeo.cms.CmsView; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.HttpRequestCallback; import org.argeo.cms.i18n.LocaleUtils; +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.eclipse.rap.rwt.RWT; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java index 29a3f54e6..6afaa767c 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLoginShell.java @@ -1,6 +1,6 @@ package org.argeo.cms.widgets.auth; -import org.argeo.cms.CmsView; +import org.argeo.cms.ui.CmsView; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsExtension.java b/org.argeo.cms/src/org/argeo/cms/CmsExtension.java deleted file mode 100644 index b574dc51d..000000000 --- a/org.argeo.cms/src/org/argeo/cms/CmsExtension.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.argeo.cms; - -import java.util.List; - -import javax.jcr.Session; - -public interface CmsExtension { - public List getDataModels(); - - public List getRoles(); - - public void onInit(Session adminSession); - - public void onStart(Session adminSession); - - public void onShutdown(Session adminSession); - - public void onDestroy(Session adminSession); -} diff --git a/org.argeo.cms/src/org/argeo/cms/DataMigration.java b/org.argeo.cms/src/org/argeo/cms/DataMigration.java deleted file mode 100644 index f75e66bd0..000000000 --- a/org.argeo.cms/src/org/argeo/cms/DataMigration.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.argeo.cms; - -import java.util.Map; - -import javax.jcr.Session; - -public interface DataMigration { - /** Migrate data between two workspaces, at JCR level. */ - Boolean migrate(Session source, Session target); - - /** - * Keys are the source workspaces and values the target workspaces. If null - * is returned, only the default workspace will be migrated, to the default - * workspace of the target repository. - */ - Map workspacesToMigrate(); - -} diff --git a/org.argeo.cms/src/org/argeo/cms/internal/backup/RepositoryMigration.java b/org.argeo.cms/src/org/argeo/cms/internal/backup/RepositoryMigration.java deleted file mode 100644 index d708f90cb..000000000 --- a/org.argeo.cms/src/org/argeo/cms/internal/backup/RepositoryMigration.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.argeo.cms.internal.backup; - -import java.security.PrivilegedExceptionAction; -import java.util.Map; - -import javax.jcr.Credentials; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -import org.argeo.cms.DataMigration; -import org.argeo.jcr.JcrUtils; - -/** Migrate data between two workspaces, at JCR level. */ -public class RepositoryMigration implements PrivilegedExceptionAction { - private final Repository sourceRepository; - private final Repository targetRepository; - private final DataMigration dataMigration; - - private Credentials sourceCredentials = null; - private Credentials targetCredentials = null; - - public RepositoryMigration(Repository sourceRepository, - Repository targetRepository, DataMigration dataMigration) { - this.sourceRepository = sourceRepository; - this.targetRepository = targetRepository; - this.dataMigration = dataMigration; - } - - @Override - public Boolean run() throws Exception { - Map wk = dataMigration.workspacesToMigrate(); - if (wk == null) - return migrate(sourceRepository, null, targetRepository, null); - else { - for (String sourceWorkspace : wk.keySet()) { - String targetWorkspace = wk.get(sourceWorkspace); - boolean ok = migrate(sourceRepository, sourceWorkspace, - targetRepository, targetWorkspace); - if (!ok) - return false; - } - return true; - } - } - - protected final boolean migrate(Repository sourceRepository, - String sourceWorkspace, Repository targetRepository, - String targetWorkspace) throws RepositoryException { - Session source = null, target = null; - try { - source = sourceRepository.login(sourceCredentials, sourceWorkspace); - target = targetRepository.login(targetCredentials, targetWorkspace); - return dataMigration.migrate(source, target); - } finally { - JcrUtils.logoutQuietly(source); - JcrUtils.logoutQuietly(target); - } - } - - public void setSourceCredentials(Credentials sourceCredentials) { - this.sourceCredentials = sourceCredentials; - } - - public void setTargetCredentials(Credentials targetCredentials) { - this.targetCredentials = targetCredentials; - } - -} -- 2.30.2