X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2FMETA-INF%2Fspring%2Fosgi.xml;h=0c121d3a34f207155b9448b0511b826f4c45f76a;hb=e6a48624d315341c3b71640b6211affda4620bf6;hp=b7f2bf14ed141b8d6f3be66132b4cc7fed500a5c;hpb=3783af8b638cfabcc728c2292e469500ca4b62cf;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 b7f2bf14e..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
@@ -1,34 +1,72 @@
 <?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">
+
+	<beans:description>SLC UI</beans:description>
+
+	<!-- 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>
+	<reference id="modulesManager"
+		interface="org.argeo.slc.execution.ExecutionModulesManager" />
+
+
+	<!-- 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" /> -->
+
 
-	<!-- DAO -->
-	<reference id="testResultCollectionDao"
-		interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
-		context-class-loader="service-provider" />
 
-	<!-- Services -->
-	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
+<!-- 	<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" /> -->
 
-	<!-- Session (to insure transactional management) -->
-	<!-- <reference id="sessionFactory" interface="org.hibernate.SessionFactory" 
+	<!-- References Needed -->
+	<!-- <reference id="marshaller" interface="org.springframework.oxm.Marshaller" 
+		/> <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" 
 		/> -->
 
-	<!-- TODO : what is it for ? -->
-	<list id="slcAgents" interface="org.argeo.slc.runtime.SlcAgent" />
+	<!-- DAO -->
+<!-- 	<reference id="testResultCollectionDao" -->
+<!-- 		interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" -->
+<!-- 		context-class-loader="service-provider" /> -->
 
-	<!-- Proxy object to try solving transaction & session problem caused by 
-		using hibernate -->
-	<reference id="processListTableContent" interface="org.argeo.slc.client.core.TableContent" />
+<!-- 	<reference id="treeTestResultDao" interface="org.argeo.slc.dao.test.tree.TreeTestResultDao" -->
+<!-- 		context-class-loader="service-provider" /> -->
 
-	<!-- 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="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