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;h=f527d5b41132088cf22d1c7942c008333aa4f1c0;hp=22bd2bbe18d06b93b7a633ac9b2d7b4fc34f478e;hb=70010c4afc5799622fcad5b075740d94da074798;hpb=3f1e729ef4c76d9c946906a0983e62013945c1ef

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 22bd2bb..f527d5b 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
@@ -1,5 +1,8 @@
 package org.argeo.publishing.ui;
 
+import static org.argeo.suite.ui.SuiteApp.DEFAULT_THEME_ID_PROPERTY;
+import static org.argeo.suite.ui.SuiteApp.DEFAULT_UI_NAME_PROPERTY;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -14,10 +17,11 @@ 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.ui.DocBookTypes;
+import org.argeo.docbook.DbkType;
 import org.argeo.docbook.ui.DocumentPage;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.util.LangUtils;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -32,12 +36,17 @@ public class PublishingApp extends AbstractCmsApp {
 
 	private String pid;
 	private String defaultThemeId;
+	private String defaultUiName = "";
 
 	private CmsUiProvider landingPage;
 
 	public void init(Map<String, String> properties) {
-		defaultThemeId = properties.get("defaultThemeId");
+		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);
 		pid = properties.get(Constants.SERVICE_PID);
+
 		if (log.isDebugEnabled())
 			log.info("Publishing App " + pid + " started");
 	}
@@ -51,7 +60,7 @@ public class PublishingApp extends AbstractCmsApp {
 	@Override
 	public Set<String> getUiNames() {
 		Set<String> uiNames = new HashSet<>();
-		uiNames.add("");
+		uiNames.add(defaultUiName);
 		return uiNames;
 	}
 
@@ -61,7 +70,7 @@ public class PublishingApp extends AbstractCmsApp {
 		parent.setLayout(new GridLayout());
 		Node indexNode;
 		try {
-			indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DocBookTypes.ARTICLE);
+			indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DbkType.article.get());
 			adminSession.save();
 		} catch (RepositoryException e) {
 			throw new IllegalStateException(e);