You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2010/07/08 10:17:50 UTC
svn commit: r961623 - in
/servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file:
DynamicEndpointTest.java PollDirectoryTest.java SpringComponentTest.java
Author: gnodet
Date: Thu Jul 8 08:17:50 2010
New Revision: 961623
URL: http://svn.apache.org/viewvc?rev=961623&view=rev
Log:
SMXCOMP-771: Upgrade to spring 3.x
Modified:
servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java
servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java
servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/SpringComponentTest.java
Modified: servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java?rev=961623&r1=961622&r2=961623&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java (original)
+++ servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java Thu Jul 8 08:17:50 2010
@@ -66,7 +66,10 @@ public class DynamicEndpointTest extends
}
protected AbstractXmlApplicationContext createBeanFactory() {
- return new ClassPathXmlApplicationContext("spring-no-endpoints.xml");
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "spring-no-endpoints.xml" }, false);
+ context.setValidating(false);
+ context.refresh();
+ return context;
}
}
Modified: servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java?rev=961623&r1=961622&r2=961623&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java (original)
+++ servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java Thu Jul 8 08:17:50 2010
@@ -228,7 +228,10 @@ public class PollDirectoryTest extends S
}
protected AbstractXmlApplicationContext createBeanFactory() {
- return new ClassPathXmlApplicationContext("spring-polling.xml");
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "spring-polling.xml" }, false);
+ context.setValidating(false);
+ context.refresh();
+ return context;
}
private String getFileContent(File file) {
Modified: servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/SpringComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/SpringComponentTest.java?rev=961623&r1=961622&r2=961623&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/SpringComponentTest.java (original)
+++ servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/SpringComponentTest.java Thu Jul 8 08:17:50 2010
@@ -66,7 +66,10 @@ public class SpringComponentTest extends
}
protected AbstractXmlApplicationContext createBeanFactory() {
- return new ClassPathXmlApplicationContext("spring.xml");
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "spring.xml" }, false);
+ context.setValidating(false);
+ context.refresh();
+ return context;
}
}