From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 26 Jun 2011 12:59:27 +0000 (+0000)
Subject: Working SLC RAP UI
X-Git-Tag: argeo-slc-2.1.7~941
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=743b0b26b4c073fdd62ce3831d9e23247316fdab;p=gpl%2Fargeo-slc.git

Working SLC RAP UI

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

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 00ab25e90..d41e3fae5 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -1,46 +1,46 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.slc.server.h2,\
-org.argeo.slc.server.castor,\
-org.argeo.slc.server.hibernate,\
-org.argeo.security.dao.ldap,\
-org.argeo.security.services,\
-org.argeo.slc.server.services,\
+org.springframework.osgi.web.extender,\
 com.springsource.javax.servlet,\
-org.argeo.security.equinox,\
+org.argeo.eclipse.ui,\
 org.eclipse.core.runtime,\
 org.eclipse.equinox.common,\
+org.eclipse.equinox.http.registry,\
 org.eclipse.equinox.launcher,\
-org.springframework.osgi.web.extender,\
 org.argeo.dep.osgi.catalina.start,\
+org.argeo.server.rap.webapp,\
 org.argeo.jackrabbit.webapp,\
-org.eclipse.equinox.http.registry,\
-org.argeo.server.osgi.webapp,\
-org.argeo.slc.server.main,\
-org.argeo.slc.ria,\
-org.argeo.slc.agent,\
-org.argeo.slc.client.agent,\
-org.argeo.slc.client.core,\
-org.argeo.slc.client.hibernate,\
-org.argeo.slc.client.oxm,\
-org.argeo.slc.client.rap,\
+org.argeo.security.dao.ldap,\
+org.argeo.security.equinox,\
+org.argeo.security.services,\
+org.argeo.security.ui,\
+org.argeo.security.ui.rap,\
+org.argeo.server.ads.server,\
+org.argeo.node.repofactory.jackrabbit,\
+org.argeo.node.repo.jackrabbit,\
+org.argeo.slc.node.jackrabbit,\
 org.argeo.slc.client.ui,\
+org.argeo.slc.client.rap,\
+org.argeo.slc.infra.ui.rap,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jcr,\
 org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
 
-eclipse.ignoreApp=true
-osgi.noShutdown=true
+#slc.executionModules=org.argeo.infra.slc.rpmfactory,\
+#org.argeo.elgis.rpmfactory,\
 
 org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
 
-log4j.configuration=file:../../log4j.properties
+# JCR
+argeo.node.repo.home=data/noderepo
+argeo.node.repo.dburl=jdbc:h2:data/h2/noderepo_db
+
+# LDAP (Apache DS)
+#argeo.ads.init.ldif=osgibundle:init-argeo.ldif
 
-argeo.node.repo.home=~/.argeo/server_noderepo
-argeo.node.repo.dburl=jdbc:h2:file:~/.argeo/h2/server_noderepo_db
+eclipse.ignoreApp=true
+osgi.noShutdown=true
 
+log4j.configuration=file:../../log4j.properties
 
-# LDAP
-#argeo.ldap.rootdn=dc=slc,dc=argeo,dc=net
-#argeo.ads.init.ldif=osgibundle:init-slc.ldif
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
index 657cf6ccd..0c121d3a3 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
@@ -8,8 +8,7 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	osgi:default-timeout="30000">
 
-	<beans:description> Implements SLC specific RCP UIs.
-	</beans:description>
+	<beans:description>SLC UI</beans:description>
 
 	<!-- REFERENCES -->
 	<reference id="repository" interface="javax.jcr.Repository"
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index 108cbd5e2..7e97d35e7 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -39,6 +39,7 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
@@ -67,7 +68,9 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	public void createPartControl(Composite parent) {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		ColumnViewerToolTipSupport.enableFor(viewer);
+		
+		// FIXME : does not work in RAP, find a way to have it for RCP only
+		//ColumnViewerToolTipSupport.enableFor(viewer);
 
 		ViewContentProvider contentProvider = new ViewContentProvider(session);
 
@@ -96,7 +99,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 			throw new SlcException("Cannot add observer", e);
 		}
 	}
-
+	
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}