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:54:30 UTC

svn commit: r961645 - in /servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http: BasicAuthCredentialsTest.java HttpAddressingTest.java HttpSpringTest.java WsdlRoundtripTest.java security/HttpSecurityTest.java

Author: gnodet
Date: Thu Jul  8 08:54:30 2010
New Revision: 961645

URL: http://svn.apache.org/viewvc?rev=961645&view=rev
Log:
SMXCOMP-771: Upgrade to spring 3.x

Modified:
    servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/BasicAuthCredentialsTest.java
    servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
    servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
    servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java
    servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java

Modified: servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/BasicAuthCredentialsTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/BasicAuthCredentialsTest.java?rev=961645&r1=961644&r2=961645&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/BasicAuthCredentialsTest.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/BasicAuthCredentialsTest.java Thu Jul  8 08:54:30 2010
@@ -27,7 +27,10 @@ public class BasicAuthCredentialsTest ex
 
     @Override
     protected void setUp() throws Exception {
-        context = new ClassPathXmlApplicationContext("org/apache/servicemix/http/basic-auth.xml");
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "org/apache/servicemix/http/basic-auth.xml" }, false);
+        context.setValidating(false);
+        context.refresh();
+        this.context = context;
     }
 
     public void testApplyCredentials() throws Exception {

Modified: servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java?rev=961645&r1=961644&r2=961645&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java Thu Jul  8 08:54:30 2010
@@ -99,7 +99,10 @@ public class HttpAddressingTest extends 
     }
 
     protected AbstractXmlApplicationContext createBeanFactory() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/http/addressing.xml");
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "org/apache/servicemix/http/addressing.xml" }, false);
+        context.setValidating(false);
+        context.refresh();
+        return context;
     }
 
 }

Modified: servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpSpringTest.java?rev=961645&r1=961644&r2=961645&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpSpringTest.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/HttpSpringTest.java Thu Jul  8 08:54:30 2010
@@ -109,7 +109,10 @@ public class HttpSpringTest extends Spri
     }
 
     protected AbstractXmlApplicationContext createBeanFactory() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/http/spring.xml");
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "org/apache/servicemix/http/spring.xml" }, false);
+        context.setValidating(false);
+        context.refresh();
+        return context;
     }
 
 }

Modified: servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java?rev=961645&r1=961644&r2=961645&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java Thu Jul  8 08:54:30 2010
@@ -43,7 +43,10 @@ public class WsdlRoundtripTest extends S
     private static transient Log log = LogFactory.getLog(WsdlRoundtripTest.class);
 
     protected AbstractXmlApplicationContext createBeanFactory() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/http/wsdlroundtrip.xml");
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "org/apache/servicemix/http/wsdlroundtrip.xml" }, false);
+        context.setValidating(false);
+        context.refresh();
+        return context;
     }
 
     public void test() throws Exception {

Modified: servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java?rev=961645&r1=961644&r2=961645&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java Thu Jul  8 08:54:30 2010
@@ -173,7 +173,10 @@ public class HttpSecurityTest extends Sp
     }
 
     protected AbstractXmlApplicationContext createBeanFactory() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/http/security/secure.xml");
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "org/apache/servicemix/http/security/secure.xml" }, false);
+        context.setValidating(false);
+        context.refresh();
+        return context;
     }
 
 }