From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 30 Nov 2016 16:50:24 +0000 (+0000)
Subject: Adapt after RCP refactoring
X-Git-Tag: argeo-slc-2.1.7~12
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=62ea249cbdd91f18ab28240c90e0f8017223559e;p=gpl%2Fargeo-slc.git

Adapt after RCP refactoring

git-svn-id: https://svn.argeo.org/slc/trunk@9345 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties
index 8a7ff4d16..284b1e6ea 100644
--- a/demo/slc_demo_rcp.properties
+++ b/demo/slc_demo_rcp.properties
@@ -1,37 +1,33 @@
 argeo.osgi.start=\
-org.springframework.osgi.extender,\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.security.dao.os,\
-org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.agent,\
-org.argeo.slc.agent.jcr,\
-org.argeo.slc.support.maven,\
-org.argeo.slc.server.repo,\
-
-argeo.osgi.start.5=org.argeo.server.catalina.start,\
-org.springframework.osgi.web.extender,\
+org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.equinox.metatype,\
+org.eclipse.equinox.cm,\
+org.eclipse.rap.rwt.osgi
+
+argeo.osgi.start.3.node=\
+org.argeo.cms
+
+
+argeo.osgi.start.4.apps=\
+org.eclipse.gemini.blueprint.extender
+
+argeo.osgi.start.5.apps=\
 org.argeo.jackrabbit.webapp,\
-org.argeo.slc.server.repo.webapp,\
 
 slc.executionModules=org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
 org.argeo.slc.demo.minimal,\
 
+#Branding
 eclipse.application=org.argeo.slc.client.rcp.application
 org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
 
 log4j.configuration=file:../../log4j.properties
 
-argeo.server.tomcat.config=conf/default-server-ssl.xml
-
-# override ports to run the demo as a server
-# argeo.server.port.http=9070
-# argeo.server.port.https=9073
-# argeo.server.port.ajp=9079 
-# argeo.ldap.port=19389
+#argeo.server.tomcat.config=conf/default-server-ssl.xml
 
-# in memory
-#argeo.node.repo.configuration=osgibundle:repository-memory.xml
+org.osgi.framework.security=osgi
+java.security.policy=file:../../all.policy
 
-# remote node
-#argeo.node.repo.uri=http://localrepo:7070/org.argeo.jcr.webapp/remoting/node
+org.eclipse.equinox.http.jetty.autostart=false
diff --git a/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java
index 97d40c260..22466fbf6 100644
--- a/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java
+++ b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.slc.client.rcp;
 
-import org.argeo.security.ui.rcp.SecureRcp;
+import org.argeo.cms.ui.workbench.rcp.SecureRcp;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.window.Window.IExceptionHandler;
 import org.eclipse.ui.application.WorkbenchAdvisor;
diff --git a/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java
index 785197d16..e24188054 100644
--- a/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java
+++ b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.slc.client.rcp;
 
-import org.argeo.security.ui.rcp.SecureWorkbenchAdvisor;
+import org.argeo.cms.ui.workbench.rcp.SecureWorkbenchAdvisor;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
diff --git a/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java
index 7eecc9e94..f3506de35 100644
--- a/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java
+++ b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.slc.client.rcp;
 
-import org.argeo.security.ui.rcp.SecureWorkbenchWindowAdvisor;
+import org.argeo.cms.ui.workbench.rcp.SecureWorkbenchWindowAdvisor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DropTargetAdapter;
 import org.eclipse.swt.dnd.DropTargetEvent;