Adapt to changes in CMS

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 6da9ae8efc78910439a79a8fc3e62d69fe1354d2..490606f0f1b26e4b6592f6c997b239fa5703f32a 100644 (file)
--- a/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpApp.xml
+++ b/rcp/org.argeo.cms.ui.rcp/OSGI-INF/cmsRcpApp.xml
@@ -3,4 +3,5 @@
    <implementation class="org.argeo.cms.ui.rcp.CmsRcpApp"/>
    <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"/>
+   <reference bind="setCmsContext" cardinality="1..1" interface="org.argeo.api.cms.CmsContext" name="CmsContext" policy="static"/>
 </scr:component>

diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
index 8614d70b58a97bfd1a3da75b49dc88347602b03d..fb56773b86bb8bac3744d09e71766045fea377e5 100644 (file)
--- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
+++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
@@ -13,12 +13,13 @@ import javax.security.auth.login.LoginException;
 
 import org.argeo.api.cms.CmsApp;
 import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsContext;
 import org.argeo.api.cms.CmsImageManager;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsUi;
 import org.argeo.api.cms.CmsView;
-import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.UxContext;
 import org.argeo.cms.osgi.CmsOsgiUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -46,6 +47,8 @@ public class CmsRcpApp implements CmsView {
        private CmsApp cmsApp;
        private CmsUiThread uiThread;
 
+       private CmsContext cmsContext;
+       
        // CMS View
        private String uid;
        private LoginContext loginContext;
@@ -93,7 +96,7 @@ public class CmsRcpApp implements CmsView {
 
                @Override
                public void run() {
-                       display = new Display();
+                       display = Display.getDefault();
                        shell = new Shell(display);
                        shell.setText("Argeo CMS");
                        Composite parent = shell;
@@ -165,10 +168,16 @@ public class CmsRcpApp implements CmsView {
 
        }
 
+       
+       
        /*
         * CMS VIEW
         */
 
+       public void setCmsContext(CmsContext cmsContext) {
+               this.cmsContext = cmsContext;
+       }
+
        @Override
        public String getUid() {
                return uid;

diff --git a/sdk/cms-e4-rcp.properties b/sdk/cms-e4-rcp.properties
new file mode 100644 (file)
index 0000000..df8363b
--- /dev/null
+++ b/sdk/cms-e4-rcp.properties
@@ -0,0 +1,39 @@
+argeo.osgi.start.2.node=\
+org.eclipse.equinox.metatype,\
+org.eclipse.equinox.cm,\
+org.eclipse.equinox.ds,\
+org.argeo.init
+
+argeo.osgi.start.3.node=\
+org.argeo.cms,\
+org.argeo.cms.jcr,\
+org.argeo.cms.ui.rcp
+
+
+# Local
+argeo.node.repo.type=h2
+org.osgi.service.http.port=7070
+#org.osgi.service.http.port.secure=7073
+
+argeo.node.useradmin.uris=os:///
+
+#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost:10389/dc=example,dc=com
+
+argeo.node.init=../../init
+
+argeo.i18n.locales=en,fr
+argeo.i18n.defaultLocale=en
+
+#tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml
+
+# Logging
+log.org.argeo=DEBUG
+
+# DON'T CHANGE BELOW
+org.eclipse.equinox.http.jetty.autostart=false
+org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\
+com.sun.jndi.ldap.sasl,\
+com.sun.security.jgss,\
+com.sun.jndi.dns,\
+com.sun.nio.file,\
+com.sun.nio.sctp