X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fscript%2FCmsScriptApp.java;h=e639412100fa061c01be023eb375a643e26b1c8a;hb=5f1074b1658db47705b0b532099e19ba918c5745;hp=e6ccf52a7567b8a2056ab653d1fc11c6f9834414;hpb=a667d43d6a3ccef0e701320e9a61e50d8608615e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java b/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java
index e6ccf52a7..e63941210 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptApp.java
@@ -2,7 +2,9 @@ package org.argeo.cms.script;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
@@ -15,21 +17,29 @@ import javax.jcr.PropertyType;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.script.ScriptEngine;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.CmsConstants;
+import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.util.BundleResourceLoader;
 import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.util.SimpleErgonomics;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.application.Application.OperationMode;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.eclipse.rap.rwt.application.ExceptionHandler;
 import org.eclipse.rap.rwt.client.WebClient;
 import org.eclipse.rap.rwt.service.ResourceLoader;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.NamespaceException;
 
 public class CmsScriptApp implements Branding {
 	public final static String CONTEXT_NAME = "contextName";
@@ -50,6 +60,12 @@ public class CmsScriptApp implements Branding {
 
 	private Map<String, AppUi> ui = new HashMap<>();
 
+	private CmsUiProvider header;
+	private Integer headerHeight = null;
+	private CmsUiProvider lead;
+	private CmsUiProvider end;
+	private CmsUiProvider footer;
+
 	// Branding
 	private String themeId;
 	private String additionalHeaders;
@@ -94,13 +110,46 @@ public class CmsScriptApp implements Branding {
 			themeId = theme.getThemeId();
 		}
 
+		// client JavaScript
+		Bundle appBundle = bundleRL.getBundle();
+		BundleContext bc = appBundle.getBundleContext();
+		HttpService httpService = bc.getService(bc.getServiceReference(HttpService.class));
+		HttpContext httpContext = new BundleHttpContext(bc);
+		Enumeration<URL> themeResources = appBundle.findEntries("/js/", "*", true);
+		if (themeResources != null)
+			bundleResources: while (themeResources.hasMoreElements()) {
+				try {
+					String name = themeResources.nextElement().getPath();
+					if (name.endsWith("/"))
+						continue bundleResources;
+					String alias = "/" + getWebPath() + name;
+
+					httpService.registerResources(alias, name, httpContext);
+					if (log.isDebugEnabled())
+						log.debug("Mapped " + name + " to alias " + alias);
+
+				} catch (NamespaceException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+
+		// App UIs
 		for (String appUiName : ui.keySet()) {
 			AppUi appUi = ui.get(appUiName);
 			appUi.apply(repository, application, this, appUiName);
+
 		}
 
 	}
 
+	public void applySides(SimpleErgonomics simpleErgonomics) {
+		simpleErgonomics.setHeader(header);
+		simpleErgonomics.setLead(lead);
+		simpleErgonomics.setEnd(end);
+		simpleErgonomics.setFooter(footer);
+	}
+
 	public void register(BundleContext bundleContext, ApplicationConfiguration appConfig) {
 		Hashtable<String, String> props = new Hashtable<>();
 		props.put(CONTEXT_NAME, webPath);
@@ -301,4 +350,71 @@ public class CmsScriptApp implements Branding {
 		this.favicon = favicon;
 	}
 
+	public CmsUiProvider getHeader() {
+		return header;
+	}
+
+	public void setHeader(CmsUiProvider header) {
+		this.header = header;
+	}
+
+	public Integer getHeaderHeight() {
+		return headerHeight;
+	}
+
+	public void setHeaderHeight(Integer headerHeight) {
+		this.headerHeight = headerHeight;
+	}
+
+	public CmsUiProvider getLead() {
+		return lead;
+	}
+
+	public void setLead(CmsUiProvider lead) {
+		this.lead = lead;
+	}
+
+	public CmsUiProvider getEnd() {
+		return end;
+	}
+
+	public void setEnd(CmsUiProvider end) {
+		this.end = end;
+	}
+
+	public CmsUiProvider getFooter() {
+		return footer;
+	}
+
+	public void setFooter(CmsUiProvider footer) {
+		this.footer = footer;
+	}
+
+	static class BundleHttpContext implements HttpContext {
+		private BundleContext bundleContext;
+
+		public BundleHttpContext(BundleContext bundleContext) {
+			super();
+			this.bundleContext = bundleContext;
+		}
+
+		@Override
+		public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException {
+			// TODO Auto-generated method stub
+			return true;
+		}
+
+		@Override
+		public URL getResource(String name) {
+
+			return bundleContext.getBundle().getEntry(name);
+		}
+
+		@Override
+		public String getMimeType(String name) {
+			return null;
+		}
+
+	}
+
 }