Adapt CMS RCP to recent changes.

diff --git a/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties b/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties
index 9288d85550b3bfbb2bb510a6290f2c9394a6ccbf..0a0da7581af5a864099d9bb3f0bd9725639dd29c 100644 (file)
--- a/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties
+++ b/rcp/org.argeo.cms.e4.rcp/argeo-companion.properties
@@ -1,10 +1,12 @@
 argeo.osgi.start.2.node=\
+org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.metatype,\
-org.eclipse.equinox.ds,\
 org.eclipse.equinox.cm,\
+org.argeo.init
 
 argeo.osgi.start.3.node=\
-org.argeo.cms
+org.argeo.cms,\
+org.argeo.cms.jcr,\
 
 applicationXMI=org.argeo.cms.e4.rcp/argeo-companion.e4xmi
 lifeCycleURI=bundleclass://org.argeo.cms.e4.rcp/org.argeo.cms.e4.rcp.CmsRcpLifeCycle
@@ -14,6 +16,8 @@ clearPersistedState=true
 # Remote node:
 #argeo.node.repo.labeledUri=http://root:demo@localhost:7070/jcr/node
 
-log4j.configuration=file:../../log4j.properties
+# Logging
+log.org.argeo=DEBUG
+
 argeo.node.useradmin.uris=os:///
 eclipse.application=org.argeo.cms.e4.rcp.CmsE4Application

diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
index 5cc6a839453bacea1144dce120f79f5a2cd2e155..629da60aae8eefae2871ada690bcfe1ab582eb9f 100644 (file)
--- a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
+++ b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
@@ -31,6 +31,9 @@ public class CmsE4Application implements IApplication, CmsView {
 
        @Override
        public Object start(IApplicationContext context) throws Exception {
+               // TODO wait for CMS to be ready
+               Thread.sleep(5000);
+               
                uid = UUID.randomUUID().toString();
                Subject subject = new Subject();
                Display display = createDisplay();
@@ -39,7 +42,7 @@ public class CmsE4Application implements IApplication, CmsView {
                loginShell.setSubject(subject);
                try {
                        // try pre-auth
-                       loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, subject, loginShell);
+                       loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_SINGLE_USER, subject, loginShell);
                        loginContext.login();
                } catch (LoginException e) {
                        e.printStackTrace();

diff --git a/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpApp.xml b/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpApp.xml
index 3b7f260910ac36badd0e5ceb187054f838158fe5..6da9ae8efc78910439a79a8fc3e62d69fe1354d2 100644 (file)
--- a/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpApp.xml
+++ b/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpApp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="CMS RCP App">
    <implementation class="org.argeo.cms.ui.rcp.CmsRcpApp"/>
-   <reference bind="setCmsApp" cardinality="1..1" interface="org.argeo.cms.ui.CmsApp" name="CmsApp" policy="dynamic"/>
+   <reference bind="setCmsApp" cardinality="1..1" interface="org.argeo.api.cms.CmsApp" name="CmsApp" policy="dynamic"/>
    <reference bind="setEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static"/>
 </scr:component>