X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2FMETA-INF%2Fspring%2Fosgi.xml;h=67caaabde35f36ecdedb060925603a188962fb8d;hb=a0e8f9b4d92028975baaba0317899536045804c8;hp=e73da5a8e7e28822201a5dec5ae8682c41f5c3d8;hpb=8d63b14238448a9d11481e4071eba9d20e161ae2;p=gpl%2Fargeo-slc.git

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 e73da5a8e..67caaabde 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
@@ -1,34 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
 	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
        http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	osgi:default-timeout="30000">
 
-	<!-- DAO -->
-	<reference id="testResultCollectionDao"
-		interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" />
-	<reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao" />
+	<beans:description> Implements SLC specific RCP UIs.
+	</beans:description>
 
-	<!-- Services -->
-	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
+	<!-- REFERENCES -->
+	<reference id="repository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=slc)" />
+	<list id="agentFactories" interface="org.argeo.slc.runtime.SlcAgentFactory">
+		<osgi:listener ref="processController" bind-method="register"
+			unbind-method="unregister" />
+	</list>
 
-	<!-- Session (to insure transactional management) -->
-	<!-- <reference id="sessionFactory" interface="org.hibernate.SessionFactory" 
-		/> -->
 
-	<!-- TODO : what is it for ? -->
-	<list id="slcAgents" interface="org.argeo.slc.runtime.SlcAgent" />
-
-	<!-- Proxy object to try solving transaction & session problem caused by 
-		using hibernate -->
-	<reference id="processListTableContent" interface="org.argeo.slc.client.core.TableContent" />
+	<!-- Services exposed by the current bundle -->
 
 	<!-- Listeners used by the execution modules -->
 	<service ref="testManagerServiceAdapter"
 		interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
 	<service ref="slcExecutionServiceAdapter" interface="org.argeo.slc.process.SlcExecutionNotifier" />
 
+
+
+	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
+	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
+	<reference id="oxmBean" interface="org.argeo.slc.client.oxm.OxmInterface" />
+
+	<!-- References Needed -->
+	<!-- <reference id="marshaller" interface="org.springframework.oxm.Marshaller" 
+		/> <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" 
+		/> -->
+
+	<!-- DAO -->
+	<reference id="testResultCollectionDao"
+		interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
+		context-class-loader="service-provider" />
+
+	<reference id="treeTestResultDao" interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
+		context-class-loader="service-provider" />
+
+
+	<reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao"
+		context-class-loader="service-provider" />
+
+	<!-- Content providers are deported in an other bundle for UI not to depend 
+		on DB used implementation. We use bean-name reference because interface is 
+		not enough to choose between various been with same interface -->
+	<reference id="processListTableLabelProvider" interface="org.eclipse.jface.viewers.ITableLabelProvider"
+		bean-name="processListTableLabelProvider" />
+	<reference id="processListStructuredContentProvider"
+		interface="org.eclipse.jface.viewers.IStructuredContentProvider"
+		bean-name="processListStructuredContentProvider" />
+	<reference id="processDetailContentProvider"
+		interface="org.eclipse.jface.viewers.ITreeContentProvider" bean-name="processDetailContentProvider" />
+	<reference id="resultDetailContentProvider"
+		interface="org.eclipse.jface.viewers.ITreeContentProvider" bean-name="resultDetailContentProvider" />
+	<reference id="resultDetailLabelProvider" interface="org.eclipse.jface.viewers.ITableLabelProvider"
+		bean-name="resultDetailLabelProvider" />
+
+
+	<!-- TODO : what is it for ? -->
+	<list id="slcAgents" interface="org.argeo.slc.runtime.SlcAgent" />
 </beans:beans>
\ No newline at end of file