From 92b77a90db637e71a7ccbc76fc12bad6ba4a289a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 27 Nov 2019 21:32:20 +0100 Subject: [PATCH] Adapt CMS Web to new assembly approach. --- .../src/org/argeo/cms/ui/AbstractCmsEntryPoint.java | 4 +++- org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java | 2 +- org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) 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 529061e92..2cd86ce08 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 @@ -328,7 +328,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement private String publishMetaData(Node node) throws RepositoryException { // Title String title; - if (node!=null && node.isNodeType(NodeType.MIX_TITLE) && node.hasProperty(Property.JCR_TITLE)) + if (node != null && node.isNodeType(NodeType.MIX_TITLE) && node.hasProperty(Property.JCR_TITLE)) title = node.getProperty(Property.JCR_TITLE).getString() + " - " + getBaseTitle(); else title = getBaseTitle(); @@ -338,6 +338,8 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement return null; StringBuilder js = new StringBuilder(); + if (title == null) + title = ""; title = title.replace("'", "\\'");// sanitize js.append("document.title = '" + title + "';"); jsExecutor.execute(js.toString()); 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 faf01182b..b18770f18 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 @@ -85,7 +85,7 @@ public class CmsLink implements CmsUiProvider { // + " Make sure bundleContext property is set and init() method has been called."); // } - Composite comp = new Composite(parent, SWT.BOTTOM); + Composite comp = new Composite(parent, SWT.NONE); comp.setLayout(CmsUtils.noSpaceGridLayout()); Label link = new Label(comp, SWT.NONE); 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 5b0e1b779..327438b56 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 @@ -26,6 +26,7 @@ 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; @@ -147,8 +148,8 @@ public class SimpleApp implements CmsConstants, ApplicationConfiguration { log.debug("Theme " + themeId); for (String css : cssLst) { application.addStyleSheet(themeId, css, styleSheetRL); - if (log.isTraceEnabled()) - log.trace(" CSS " + css); + if (log.isDebugEnabled()) + log.debug(" CSS " + css); } } @@ -168,7 +169,8 @@ public class SimpleApp implements CmsConstants, ApplicationConfiguration { public void init() throws RepositoryException { Session session = null; try { - session = JcrUtils.loginOrCreateWorkspace(repository, workspace); + session = NodeUtils.openDataAdminSession(repository, workspace); + // session = JcrUtils.loginOrCreateWorkspace(repository, workspace); VersionManager vm = session.getWorkspace().getVersionManager(); JcrUtils.mkdirs(session, jcrBasePath); session.save(); -- 2.30.2