Improve SLC GIS Position

[gpl/argeo-slc.git] / modules / gis / org.argeo.slc.gis.position.ui / META-INF / spring / ui.xml

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 195d9dc1e4883274d8ec82fe59456c0305ee86da..425fcb3e388cd764dbb0b2b2d36ff466d5f090b7 100644 (file)
--- 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"?>\r
 <beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:osgi="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xmlns:p="http://www.springframework.org/schema/p"\r
        xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+       http://www.springframework.org/schema/beans\r
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/osgi  \r
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+    ">\r
 \r
-       <bean id="ui" class="org.argeo.slc.geotools.SimpleGisFieldViewer"\r
-               init-method="run">\r
+       <bean id="ui" class="org.argeo.slc.geotools.swing.GisFieldViewer">\r
                <property name="positionProvider" ref="positionProvider" />\r
-               <property name="jaiImageIoClassLoader">\r
-                       <bean class="org.springframework.osgi.util.BundleDelegatingClassLoader"\r
-                               factory-method="createBundleClassLoaderFor">\r
-                               <constructor-arg>\r
-                                       <ref bean="jai.imageio" />\r
-                                       <!--\r
-                                               <bean factory-bean="bundleContext" factory-method="getBundle" />\r
-                                       -->\r
-                               </constructor-arg>\r
+               <property name="jaiImageIoClassLoader" ref="jai.imageio.bdClassLoader" />\r
+               <property name="vectors">\r
+                       <bean class="org.argeo.slc.core.deploy.DefaultResourceSet">\r
+                               <property name="base"\r
+                                       value="file:/home/mbaudier/gis/projects/100122-EasternBalkans2010/data" />\r
+                               <property name="include" value="*.shp" />\r
+                       </bean>\r
+                       <!--\r
+                               <list>\r
+                               <value>file:/home/mbaudier/gis/projects/100122-EasternBalkans2010/data/countries-EuroMed-NEarth.shp\r
+                               </value>\r
+                               <value>file:/home/mbaudier/gis/projects/100122-EasternBalkans2010/data/highways-EastBalkan-OSM.shp\r
+                               </value> </list>\r
+                       -->\r
+               </property>\r
+               <property name="rasters">\r
+                       <bean class="org.argeo.slc.core.deploy.DefaultResourceSet">\r
+                               <property name="base"\r
+                                       value="file:/home/mbaudier/gis/data/100501-Poehali" />\r
+                               <property name="include" value="*.gif" />\r
                        </bean>\r
                </property>\r
        </bean>\r
+\r
+       <bean id="jai.imageio.bdClassLoader"\r
+               class="org.springframework.osgi.util.BundleDelegatingClassLoader"\r
+               factory-method="createBundleClassLoaderFor">\r
+               <constructor-arg>\r
+                       <osgi:bundle symbolic-name="org.argeo.dep.osgi.jai.imageio" />\r
+               </constructor-arg>\r
+       </bean>\r
+\r
 </beans>
\ No newline at end of file