X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fgis%2Forg.argeo.slc.gis.position.ui%2FMETA-INF%2Fspring%2Fui.xml;h=425fcb3e388cd764dbb0b2b2d36ff466d5f090b7;hb=d758d1d9a10ab42a0542cf890a6e26c26f4f0fc7;hp=195d9dc1e4883274d8ec82fe59456c0305ee86da;hpb=d3a5063833293cf77e680aa856dc28533414f5c4;p=gpl%2Fargeo-slc.git

diff --git a/modules/gis/org.argeo.slc.gis.position.ui/META-INF/spring/ui.xml b/modules/gis/org.argeo.slc.gis.position.ui/META-INF/spring/ui.xml
index 195d9dc1e..425fcb3e3 100644
--- a/modules/gis/org.argeo.slc.gis.position.ui/META-INF/spring/ui.xml
+++ b/modules/gis/org.argeo.slc.gis.position.ui/META-INF/spring/ui.xml
@@ -1,22 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:osgi="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	http://www.springframework.org/schema/beans
+	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/osgi  
+	http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+    ">
 
-	<bean id="ui" class="org.argeo.slc.geotools.SimpleGisFieldViewer"
-		init-method="run">
+	<bean id="ui" class="org.argeo.slc.geotools.swing.GisFieldViewer">
 		<property name="positionProvider" ref="positionProvider" />
-		<property name="jaiImageIoClassLoader">
-			<bean class="org.springframework.osgi.util.BundleDelegatingClassLoader"
-				factory-method="createBundleClassLoaderFor">
-				<constructor-arg>
-					<ref bean="jai.imageio" />
-					<!--
-						<bean factory-bean="bundleContext" factory-method="getBundle" />
-					-->
-				</constructor-arg>
+		<property name="jaiImageIoClassLoader" ref="jai.imageio.bdClassLoader" />
+		<property name="vectors">
+			<bean class="org.argeo.slc.core.deploy.DefaultResourceSet">
+				<property name="base"
+					value="file:/home/mbaudier/gis/projects/100122-EasternBalkans2010/data" />
+				<property name="include" value="*.shp" />
+			</bean>
+			<!--
+				<list>
+				<value>file:/home/mbaudier/gis/projects/100122-EasternBalkans2010/data/countries-EuroMed-NEarth.shp
+				</value>
+				<value>file:/home/mbaudier/gis/projects/100122-EasternBalkans2010/data/highways-EastBalkan-OSM.shp
+				</value> </list>
+			-->
+		</property>
+		<property name="rasters">
+			<bean class="org.argeo.slc.core.deploy.DefaultResourceSet">
+				<property name="base"
+					value="file:/home/mbaudier/gis/data/100501-Poehali" />
+				<property name="include" value="*.gif" />
 			</bean>
 		</property>
 	</bean>
+
+	<bean id="jai.imageio.bdClassLoader"
+		class="org.springframework.osgi.util.BundleDelegatingClassLoader"
+		factory-method="createBundleClassLoaderFor">
+		<constructor-arg>
+			<osgi:bundle symbolic-name="org.argeo.dep.osgi.jai.imageio" />
+		</constructor-arg>
+	</bean>
+
 </beans>
\ No newline at end of file