Integrate XML-based file exchanges.

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

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index 03b8237ee30fdbb0e28c3917d4eccd2566aa0974..9a3edf3910ef4505a6ad95ce8cb967d0341518a1 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -34,7 +34,7 @@
                             org.argeo.slc.jemmytest.*
                         </Export-Package>
                         <Import-Package>
-                            *,org.springframework.beans.factory.xml
+                            *,org.springframework.beans.factory.xml;version=2.0.8
                         </Import-Package>
                         <Require-Bundle>
                             org.argeo.slc.detached
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.0.8</version>
         </dependency>
 
         <dependency>

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
index efbcc23f5fba8c9ebc28a07e360fc6d15d32133b..8137f4babcc992445bed15f5eccdd4f4d4ed4782 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0\r
-Export-Package: org.argeo.slc.jemmytest;uses:="org.apache.commons.logg\r
- ing,org.netbeans.jemmy.operators,org.argeo.slc.detached"\r
+Export-Package: org.argeo.slc.jemmytest;uses:="org.argeo.slc.detached.\r
+ ui,org.apache.commons.logging,org.netbeans.jemmy.operators,org.argeo.\r
+ slc.detached"\r
 Built-By: mbaudier\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: SLC Sandbox JemmyTest\r
@@ -9,14 +10,14 @@ Require-Bundle: org.argeo.slc.detached
 Bundle-Vendor: Argeo\r
 Build-Jdk: 1.6.0\r
 Bundle-Version: 0.11.1.SNAPSHOT\r
-Bnd-LastModified: 1222929009409\r
+Bnd-LastModified: 1223213686474\r
 Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator\r
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
 Import-Package: org.apache.commons.logging,org.argeo.slc.detached,org.\r
- argeo.slc.jemmytest,org.netbeans.jemmy.operators,org.springframework.\r
- beans.factory.xml\r
+ argeo.slc.detached.ui,org.argeo.slc.jemmytest,org.netbeans.jemmy.oper\r
+ ators,org.springframework.beans.factory.xml;version="2.0.8"\r
 Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: Apache Maven Bundle Plugin\r

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
index 45480d5b1a3dddf7d571e4a65767fa7bdc0df0f8..9bb6659be1eb8a55d43ed7d7b8a6fcc548b7ccff 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
@@ -11,6 +11,7 @@
     <bean id="slcDetached.driver"
         class="org.argeo.slc.detached.drivers.FileDriver">
         <property name="baseDir" value="file:${slc.workDir}/detached" />
+        <property name="xmlConverter"
+            ref="slcDefault.detached.xmlConverterCompat" />
     </bean>
-
 </beans>
\ No newline at end of file

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
index 0d4e3d8ca7ca14df35fbfb1b1340308af33bc29e..f857c1caffa46df09c6ba92b71a91d54c66d2293 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
@@ -4,6 +4,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
     <import resource="classpath:/META-INF/spring/slc-detached.xml" />
+    <import resource="classpath:/org/argeo/slc/lib/detached/spring.xml" />
 
     <bean id="detachedTestDef"
         class="org.argeo.slc.lib.detached.DetachedTestDefinition">
@@ -11,6 +12,13 @@
         <property name="step" ref="jemmyTest" />
     </bean>
 
+    <bean id="slcDetached.driver"
+        class="org.argeo.slc.detached.drivers.FileDriver">
+        <property name="baseDir" value="file:${slc.workDir}/detached" />
+        <property name="xmlConverter"
+            ref="slcDefault.detached.xmlConverterCastor" />
+    </bean>
+
     <bean id="detachedTestData1"
         class="org.argeo.slc.lib.detached.DetachedTestData"
         scope="prototype">