X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=848206f5c5248833707a99838b92bceb3210d031;hb=32ab2ae391458ee3782b0acfdaabdf11cb2094ed;hp=4b893f13d0b6e195be13c8354b8ab2dc756d8cb0;hpb=0dfb0eba9a5e380e879b00161a9ab997adcbbdb3;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java index 4b893f13d..848206f5c 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java @@ -1,7 +1,5 @@ package org.argeo.cms.internal.kernel; -import java.util.Hashtable; - import javax.jcr.RepositoryFactory; import org.apache.commons.logging.Log; @@ -10,8 +8,6 @@ import org.argeo.ArgeoException; import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory; import org.argeo.security.core.InternalAuthentication; import org.eclipse.rap.rwt.application.ApplicationConfiguration; -import org.eclipse.rap.rwt.osgi.ApplicationLauncher; -import org.eclipse.rap.ui.internal.servlet.WorkbenchApplicationConfiguration; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.springframework.security.core.context.SecurityContextHolder; @@ -27,10 +23,9 @@ import org.springframework.security.core.context.SecurityContextHolder; *
  • OS access
  • * */ -@SuppressWarnings("restriction") final class Kernel { private final static Log log = LogFactory.getLog(Kernel.class); - private static final String PROP_WORKBENCH_AUTOSTART = "org.eclipse.rap.workbenchAutostart"; +// private static final String PROP_WORKBENCH_AUTOSTART = "org.eclipse.rap.workbenchAutostart"; private final BundleContext bundleContext; @@ -64,11 +59,11 @@ final class Kernel { repositoryFactory, null); nodeHttp.publish(); - if ("false".equals(bundleContext - .getProperty(PROP_WORKBENCH_AUTOSTART))) { - WorkbenchApplicationConfiguration wac = new WorkbenchApplicationConfiguration(); - registerWorkbench(wac); - } +// if ("false".equals(bundleContext +// .getProperty(PROP_WORKBENCH_AUTOSTART))) { +// WorkbenchApplicationConfiguration wac = new WorkbenchApplicationConfiguration(); +// registerWorkbench(wac); +// } } catch (Exception e) { log.error("Cannot initialize Argeo CMS", e); throw new ArgeoException("Cannot initialize", e); @@ -95,16 +90,16 @@ final class Kernel { + (duration % 1000) + "s ##"); } - private void registerWorkbench(final WorkbenchApplicationConfiguration wac) { - new Thread("Worbench Launcher") { - public void run() { - Hashtable props = new Hashtable(); - props.put(ApplicationLauncher.PROPERTY_CONTEXT_NAME, "ui"); - workbenchReg = bundleContext.registerService( - ApplicationConfiguration.class, wac, props); - } - }.start(); - } +// private void registerWorkbench(final WorkbenchApplicationConfiguration wac) { +// new Thread("Worbench Launcher") { +// public void run() { +// Hashtable props = new Hashtable(); +// props.put(ApplicationLauncher.PROPERTY_CONTEXT_NAME, "ui"); +// workbenchReg = bundleContext.registerService( +// ApplicationConfiguration.class, wac, props); +// } +// }.start(); +// } private void directorsCut() { final long ms = 128l + (long) (Math.random() * 128d);