org.osgi.service.http.port=7070
org.eclipse.equinox.http.jetty.log.stderr.threshold=info
-org.eclipse.equinox.http.jetty.context.path=/ui
+#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
osgi.console.enable.builtin=true
-org.eclipse.rap.workbenchAutostart=true
\ No newline at end of file
+org.eclipse.rap.workbenchAutostart=false
\ No newline at end of file
package org.argeo.cms.internal.kernel;
-import java.util.Hashtable;
-
import javax.jcr.RepositoryFactory;
import org.apache.commons.logging.Log;
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;
* <li>OS access</li>
* </ul>
*/
-@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;
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);
+ (duration % 1000) + "s ##");
}
- private void registerWorkbench(final WorkbenchApplicationConfiguration wac) {
- new Thread("Worbench Launcher") {
- public void run() {
- Hashtable<String, String> props = new Hashtable<String, String>();
- 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<String, String> props = new Hashtable<String, String>();
+// 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);
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.argeo.eclipse.ui.workbench.rap</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments />
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments />
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+ xmlns:util="http://www.springframework.org/schema/util"\r
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi \r
+ http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+ http://www.springframework.org/schema/beans \r
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+ http://www.springframework.org/schema/util\r
+ http://www.springframework.org/schema/util/spring-util-2.5.xsd">\r
+\r
+ <service interface="org.eclipse.rap.rwt.application.ApplicationConfiguration">\r
+ <service-properties>\r
+ <beans:entry key="contextName" value="ui" />\r
+ </service-properties>\r
+ <beans:bean\r
+ class="org.eclipse.rap.ui.internal.servlet.WorkbenchApplicationConfiguration" />\r
+ </service>\r
+</beans:beans>
\ No newline at end of file
--- /dev/null
+Bundle-SymbolicName: org.argeo.eclipse.ui.workbench.rap;singleton:=true
+Bundle-ActivationPolicy: lazy
+
+Fragment-Host: org.eclipse.rap.ui.workbench
--- /dev/null
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.argeo.commons</groupId>
+ <version>2.1.13-SNAPSHOT</version>
+ <artifactId>argeo-commons</artifactId>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>org.argeo.eclipse.ui.workbench.rap</artifactId>
+ <name>Commons Eclipse UI Workbench RAP</name>
+</project>
<module>org.argeo.cms</module>
<!-- Workbench -->
<module>org.argeo.eclipse.ui.workbench</module>
+ <module>org.argeo.eclipse.ui.workbench.rap</module>
<!-- <module>org.argeo.security.equinox</module> -->
<module>org.argeo.security.ui</module>
<module>org.argeo.security.ui.admin</module>