From 23f3f53b94b01d8658b72283d258b19dbe9e1a0c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 5 Oct 2008 13:43:00 +0000
Subject: [PATCH] Integrate XML-based file exchanges.

git-svn-id: https://svn.argeo.org/slc/trunk@1702 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 sandbox/argeo.slc.jemmytest/pom.xml                   |  3 +--
 .../src/main/resources/META-INF/MANIFEST.MF           | 11 ++++++-----
 .../main/resources/META-INF/spring/slc-detached.xml   |  3 ++-
 .../src/main/slc/conf/applicationContext.xml          |  8 ++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index 03b8237ee..9a3edf391 100644
--- 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 efbcc23f5..8137f4bab 100644
--- 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
-Export-Package: org.argeo.slc.jemmytest;uses:="org.apache.commons.logg
- ing,org.netbeans.jemmy.operators,org.argeo.slc.detached"
+Export-Package: org.argeo.slc.jemmytest;uses:="org.argeo.slc.detached.
+ ui,org.apache.commons.logging,org.netbeans.jemmy.operators,org.argeo.
+ slc.detached"
 Built-By: mbaudier
 Tool: Bnd-0.0.255
 Bundle-Name: SLC Sandbox JemmyTest
@@ -9,14 +10,14 @@ Require-Bundle: org.argeo.slc.detached
 Bundle-Vendor: Argeo
 Build-Jdk: 1.6.0
 Bundle-Version: 0.11.1.SNAPSHOT
-Bnd-LastModified: 1222929009409
+Bnd-LastModified: 1223213686474
 Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: SLC Distribution
 Import-Package: org.apache.commons.logging,org.argeo.slc.detached,org.
- argeo.slc.jemmytest,org.netbeans.jemmy.operators,org.springframework.
- beans.factory.xml
+ argeo.slc.detached.ui,org.argeo.slc.jemmytest,org.netbeans.jemmy.oper
+ ators,org.springframework.beans.factory.xml;version="2.0.8"
 Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest
 Bundle-DocURL: http://www.argeo.org
 Originally-Created-By: Apache Maven Bundle Plugin
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 45480d5b1..9bb6659be 100644
--- 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 0d4e3d8ca..f857c1caf 100644
--- 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">
-- 
2.39.2