X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fpublishing%2Fui%2FPublishingApp.java;fp=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fpublishing%2Fui%2FPublishingApp.java;h=705eb96facadc4a415211beffa0e83135dc79695;hp=f527d5b41132088cf22d1c7942c008333aa4f1c0;hb=c63feb33bc17eb7e4fc6f2b47f31695ab6dfe1f8;hpb=458ef7a014567bef226a340de803b44b4ec51f62

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
index f527d5b..705eb96 100644
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
@@ -8,43 +8,46 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.jcr.Node;
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeUtils;
 import org.argeo.cms.ui.AbstractCmsApp;
 import org.argeo.cms.ui.CmsApp;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.docbook.DbkType;
 import org.argeo.docbook.ui.DocumentPage;
 import org.argeo.jcr.Jcr;
-import org.argeo.jcr.JcrUtils;
+import org.argeo.suite.ui.SuiteApp;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.osgi.framework.Constants;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventHandler;
 
 /**
  * A {@link CmsApp} dedicated to publishing, typically a public or internal web
  * site.
  */
-public class PublishingApp extends AbstractCmsApp {
+public class PublishingApp extends AbstractCmsApp implements EventHandler {
 	private final static Log log = LogFactory.getLog(PublishingApp.class);
 
 	private String pid;
 	private String defaultThemeId;
 	private String defaultUiName = "";
 
+	private String publicBasePath = null;
+
 	private CmsUiProvider landingPage;
+	private CmsUiProvider defaultProvider = new DocumentUiProvider();
 
 	public void init(Map<String, String> properties) {
 		if (properties.containsKey(DEFAULT_UI_NAME_PROPERTY))
 			defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY);
 		if (properties.containsKey(DEFAULT_THEME_ID_PROPERTY))
 			defaultThemeId = LangUtils.get(properties, DEFAULT_THEME_ID_PROPERTY);
+		publicBasePath = LangUtils.get(properties, SuiteApp.PUBLIC_BASE_PATH_PROPERTY);
 		pid = properties.get(Constants.SERVICE_PID);
 
 		if (log.isDebugEnabled())
@@ -66,21 +69,22 @@ public class PublishingApp extends AbstractCmsApp {
 
 	@Override
 	public Composite initUi(Composite parent) {
-		Session adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
+//		Session adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
+		Session session = Jcr.login(getRepository(), null);
 		parent.setLayout(new GridLayout());
-		Node indexNode;
-		try {
-			indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DbkType.article.get());
-			adminSession.save();
-		} catch (RepositoryException e) {
-			throw new IllegalStateException(e);
-		}
+		Node indexNode = Jcr.getNode(session, publicBasePath + "/index");
+//		try {
+//			indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DbkType.article.get());
+//			adminSession.save();
+//		} catch (RepositoryException e) {
+//			throw new IllegalStateException(e);
+//		}
 
 		Control page;
 		if (landingPage != null) {
 			page = landingPage.createUiPart(parent, indexNode);
 		} else {
-			page = new DocumentPage().createUiPart(parent, indexNode);
+			page = defaultProvider.createUiPart(parent, indexNode);
 		}
 		return (Composite) page;
 	}
@@ -88,7 +92,10 @@ public class PublishingApp extends AbstractCmsApp {
 	@Override
 	public void refreshUi(Composite parent, String state) {
 		parent.setLayout(new GridLayout());
-		new DocumentPage().createUiPart(parent, null);
+		if (landingPage != null)
+			landingPage.createUiPart(parent, null);
+		else
+			defaultProvider.createUiPart(parent, null);
 	}
 
 	@Override
@@ -105,4 +112,10 @@ public class PublishingApp extends AbstractCmsApp {
 		this.landingPage = landingPage;
 	}
 
+	@Override
+	public void handleEvent(Event event) {
+		// TODO listen to some events
+
+	}
+
 }