X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FAbstractCmsEntryPoint.java;h=311a8ff7cb8160a284b3db6d7d336194f89612e0;hb=666e6249290895e2b68809d3531369d33809f6b6;hp=883d84df4450e710c6ef44aad792a8e1e6c624ca;hpb=91fcd647244c5d87f8f434f261a0768bea84c528;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java index 883d84df4..311a8ff7c 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import javax.jcr.Node; -import javax.jcr.NodeIterator; +import javax.jcr.PathNotFoundException; import javax.jcr.Property; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.cms.auth.AuthConstants; import org.argeo.cms.auth.HttpRequestCallbackHandler; -import org.argeo.cms.util.CmsUtils; import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; @@ -37,8 +36,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; /** Manages history and navigation */ -public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint - implements CmsView { +public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements CmsView { private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class); private final Subject subject; @@ -52,6 +50,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint // Current state private Session session; private Node node; + private String nodePath;// useful when changing auth private String state; private String page; private Throwable exception; @@ -60,8 +59,8 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint private final JavaScriptExecutor jsExecutor; private final BrowserNavigation browserNavigation; - public AbstractCmsEntryPoint(Repository repository, String workspace, - String defaultPath, Map factoryProperties) { + public AbstractCmsEntryPoint(Repository repository, String workspace, String defaultPath, + Map factoryProperties) { this.repository = repository; this.workspace = workspace; this.defaultPath = defaultPath; @@ -70,14 +69,12 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint // Initial login try { - loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_USER, - subject, new HttpRequestCallbackHandler( - UiContext.getHttpRequest())); + loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_USER, subject, + new HttpRequestCallbackHandler(UiContext.getHttpRequest())); loginContext.login(); } catch (CredentialNotFoundException e) { try { - loginContext = new LoginContext( - AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject); + loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject); loginContext.login(); } catch (LoginException e1) { throw new ArgeoException("Cannot log as anonymous", e); @@ -90,8 +87,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint jsExecutor = RWT.getClient().getService(JavaScriptExecutor.class); browserNavigation = RWT.getClient().getService(BrowserNavigation.class); if (browserNavigation != null) - browserNavigation - .addBrowserNavigationListener(new CmsNavigationListener()); + browserNavigation.addBrowserNavigationListener(new CmsNavigationListener()); } @Override @@ -119,8 +115,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint try { initUi(parent); } catch (Exception e) { - throw new CmsException("Cannot create entrypoint contents", - e); + throw new CmsException("Cannot create entrypoint contents", e); } return null; } @@ -161,18 +156,17 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint } @Override - public Subject getSubject() { + public synchronized Subject getSubject() { return subject; } @Override - public void logout() { + public synchronized void logout() { if (loginContext == null) throw new CmsException("Login context should not be null"); try { loginContext.logout(); - LoginContext anonymousLc = new LoginContext( - AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject); + LoginContext anonymousLc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject); anonymousLc.login(); authChange(anonymousLc); } catch (LoginException e) { @@ -181,29 +175,25 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint } @Override - public void authChange(LoginContext loginContext) { + public synchronized void authChange(LoginContext loginContext) { if (loginContext == null) throw new CmsException("Login context cannot be null"); this.loginContext = loginContext; - Subject.doAs(subject, new PrivilegedAction() { + Subject.doAs(loginContext.getSubject(), new PrivilegedAction() { @Override public Void run() { try { - String currentPath = null; - if (node != null) - currentPath = node.getPath(); JcrUtils.logoutQuietly(session); - session = repository.login(workspace); - if (currentPath != null) + if (nodePath != null) try { - node = session.getNode(currentPath); - } catch (Exception e) { - logout(); - session = repository.login(workspace); + node = session.getNode(nodePath); + } catch (PathNotFoundException e) { + // logout(); + // session = repository.login(workspace); navigateTo("~"); - throw e; + // throw e; } // refresh UI @@ -225,7 +215,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint doRefresh(); } - protected void doRefresh() { + protected synchronized void doRefresh() { Subject.doAs(subject, new PrivilegedAction() { @Override public Void run() { @@ -239,7 +229,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint protected synchronized String setState(String newState) { String previousState = this.state; - node = null; + Node node = null; page = null; this.state = newState; if (newState.equals("~")) @@ -265,47 +255,11 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint node = getDefaultNode(session); page = state; } - - // Title - String title; - if (node.isNodeType(NodeType.MIX_TITLE) - && node.hasProperty(Property.JCR_TITLE)) - title = node.getProperty(Property.JCR_TITLE).getString() - + " - " + getBaseTitle(); - else - title = getBaseTitle(); - - HttpServletRequest request = RWT.getRequest(); - String url = CmsUtils.getCanonicalUrl(node, request); - String imgUrl = null; - for (NodeIterator it = node.getNodes(); it.hasNext();) { - Node child = it.nextNode(); - if (child.isNodeType(CmsTypes.CMS_IMAGE)) - imgUrl = CmsUtils.getDataUrl(child, request); - } - - StringBuilder js = new StringBuilder(); - js.append("document.title = '" + title + "';"); - js.append("var metas = document.getElementsByTagName('meta');"); - js.append("for (var i=0; i