-argeo.osgi.start.2.node=\
+argeo.osgi.start.3.node=\
org.eclipse.equinox.http.servlet,\
org.eclipse.equinox.http.jetty,\
org.eclipse.rap.rwt.osgi
org.eclipse.equinox.http.servlet,\
org.eclipse.equinox.http.jetty,\
org.eclipse.rap.rwt.osgi
-argeo.osgi.start.3.node=\
+argeo.osgi.start.4.node=\
-argeo.osgi.start.4.node=\
+argeo.osgi.start.5.node=\
org.eclipse.gemini.blueprint.extender
org.eclipse.gemini.blueprint.extender
-#argeo.osgi.start.5.cms=\
-#org.argeo.cms.demo,\
+argeo.osgi.start.5.workbench=\
+org.eclipse.equinox.http.registry,\
+
+argeo.osgi.start.5.cms=\
+org.argeo.cms.core,\
org.osgi.service.http.port=7070
org.eclipse.equinox.http.jetty.log.stderr.threshold=info
log4j.configuration=file:../../log4j.properties
org.osgi.service.http.port=7070
org.eclipse.equinox.http.jetty.log.stderr.threshold=info
log4j.configuration=file:../../log4j.properties
-osgi.console.enable.builtin=true
\ No newline at end of file
+osgi.console.enable.builtin=true
+org.eclipse.rap.workbenchAutostart=false
\ No newline at end of file
argeo.osgi.start.4.node=\
org.argeo.cms,\
argeo.osgi.start.4.node=\
org.argeo.cms,\
-org.eclipse.equinox.http.registry,\
argeo.osgi.start.5.node=\
org.eclipse.gemini.blueprint.extender
argeo.osgi.start.5.node=\
org.eclipse.gemini.blueprint.extender
+argeo.osgi.start.5.workbench=\
+org.eclipse.equinox.http.registry,\
+
org.osgi.service.http.port=7070
org.eclipse.equinox.http.jetty.log.stderr.threshold=info
org.osgi.service.http.port=7070
org.eclipse.equinox.http.jetty.log.stderr.threshold=info
-org.eclipse.equinox.http.jetty.context.path=/ui
argeo.i18n.availableLocales=en,fr,de,ru,ar
eclipse.registry.MultiLanguage=true
log4j.configuration=file:../../log4j.properties
argeo.i18n.availableLocales=en,fr,de,ru,ar
eclipse.registry.MultiLanguage=true
log4j.configuration=file:../../log4j.properties
-osgi.console.enable.builtin=true
\ No newline at end of file
+osgi.console.enable.builtin=true
+org.eclipse.rap.workbenchAutostart=false
\ No newline at end of file
package org.argeo.cms.internal.kernel;
package org.argeo.cms.internal.kernel;
+import java.util.Hashtable;
+
import javax.jcr.RepositoryFactory;
import org.apache.commons.logging.Log;
import javax.jcr.RepositoryFactory;
import org.apache.commons.logging.Log;
import org.argeo.ArgeoException;
import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory;
import org.argeo.security.core.InternalAuthentication;
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.BundleContext;
+import org.osgi.framework.ServiceRegistration;
import org.springframework.security.core.context.SecurityContextHolder;
/**
import org.springframework.security.core.context.SecurityContextHolder;
/**
* <li>OS access</li>
* </ul>
*/
* <li>OS access</li>
* </ul>
*/
+@SuppressWarnings("restriction")
final class Kernel {
private final static Log log = LogFactory.getLog(Kernel.class);
final class Kernel {
private final static Log log = LogFactory.getLog(Kernel.class);
private NodeSecurity nodeSecurity;
private NodeHttp nodeHttp;
private NodeSecurity nodeSecurity;
private NodeHttp nodeHttp;
+ private ServiceRegistration<ApplicationConfiguration> workbenchReg;
+
Kernel(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
Kernel(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
repositoryFactory = new OsgiJackrabbitRepositoryFactory();
nodeSecurity = new NodeSecurity(bundleContext, node);
nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
repositoryFactory = new OsgiJackrabbitRepositoryFactory();
nodeSecurity = new NodeSecurity(bundleContext, node);
nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
+ WorkbenchApplicationConfiguration wac = new WorkbenchApplicationConfiguration();
- // Publish services to OSGi register
+ // Publish services to OSGi
nodeSecurity.publish();
node.publish();
bundleContext.registerService(RepositoryFactory.class,
repositoryFactory, null);
nodeHttp.publish();
nodeSecurity.publish();
node.publish();
bundleContext.registerService(RepositoryFactory.class,
repositoryFactory, null);
nodeHttp.publish();
+ registerWorkbench(wac);
} catch (Exception e) {
log.error("Cannot initialize Argeo CMS", e);
throw new ArgeoException("Cannot initialize", e);
} catch (Exception e) {
log.error("Cannot initialize Argeo CMS", e);
throw new ArgeoException("Cannot initialize", e);
void destroy() {
long begin = System.currentTimeMillis();
void destroy() {
long begin = System.currentTimeMillis();
+
+ // OSGi
+ workbenchReg.unregister();
nodeHttp = null;
nodeSecurity.destroy();
nodeHttp = null;
nodeSecurity.destroy();
+ (duration % 1000) + "s ##");
}
+ (duration % 1000) + "s ##");
}
+ private ServiceRegistration<ApplicationConfiguration> registerWorkbench(
+ WorkbenchApplicationConfiguration wac) {
+ Hashtable<String, String> props = new Hashtable<String, String>();
+ props.put(ApplicationLauncher.PROPERTY_CONTEXT_NAME, "ui");
+ return bundleContext.registerService(ApplicationConfiguration.class,
+ wac, props);
+ }
+
private void directorsCut() {
final long ms = 128l + (long) (Math.random() * 128d);
log.info("Spend " + ms + "ms"
private void directorsCut() {
final long ms = 128l + (long) (Math.random() * 128d);
log.info("Spend " + ms + "ms"