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 08:47:00 UTC

svn commit: r961598 - in /servicemix/components/engines/servicemix-cxf-se/trunk: ./ src/test/java/org/apache/servicemix/cxfse/ src/test/resources/org/apache/servicemix/cxfse/ src/test/resources/org/apache/servicemix/cxfse/mtom/ src/test/resources/org/a...

Author: gnodet
Date: Thu Jul  8 06:46:59 2010
New Revision: 961598

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

Added:
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTestSupport.java
Modified:
    servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CodeFirstTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeAegisTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeContextInjectionTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeExceptionTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeMtomTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSePayloadTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeXmlBeansTest.java
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/aegis.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/code_first.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/context-injection.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom/xbean.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/payload/xbean.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxy/xbean.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxytarget/xbean.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/spring.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xbean_without_jbi_wrapper_without_soapenv.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xmlbeans.xml

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml Thu Jul  8 06:46:59 2010
@@ -222,6 +222,7 @@
         </testResource>
         <testResource>
             <directory>${basedir}/src/test/resources</directory>
+	        <filtering>true</filtering>
         </testResource> 
     </testResources>
 

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CodeFirstTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CodeFirstTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CodeFirstTest.java Thu Jul  8 06:46:59 2010
@@ -26,7 +26,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CodeFirstTest extends SpringTestSupport {
+public class CodeFirstTest extends CxfSeSpringTestSupport {
 
     private DefaultServiceMixClient client;
     private InOut io;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeAegisTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeAegisTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeAegisTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeAegisTest.java Thu Jul  8 06:46:59 2010
@@ -22,11 +22,9 @@ import javax.xml.namespace.QName;
 import org.apache.servicemix.client.DefaultServiceMixClient;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSeAegisTest extends SpringTestSupport {
+public class CxfSeAegisTest extends CxfSeSpringTestSupport {
 
     private DefaultServiceMixClient client;
     private InOut io;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeContextInjectionTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeContextInjectionTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeContextInjectionTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeContextInjectionTest.java Thu Jul  8 06:46:59 2010
@@ -29,7 +29,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSeContextInjectionTest extends SpringTestSupport {
+public class CxfSeContextInjectionTest extends CxfSeSpringTestSupport {
 
     private static final Logger LOG = LogUtils.getL7dLogger(CxfSeContextInjectionTest.class);
     private DefaultServiceMixClient client;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeExceptionTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeExceptionTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeExceptionTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeExceptionTest.java Thu Jul  8 06:46:59 2010
@@ -28,7 +28,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSeExceptionTest extends SpringTestSupport {
+public class CxfSeExceptionTest extends CxfSeSpringTestSupport {
 
     private static final Logger LOG = LogUtils.getL7dLogger(CxfSeExceptionTest.class);
     private DefaultServiceMixClient client;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeMtomTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeMtomTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeMtomTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeMtomTest.java Thu Jul  8 06:46:59 2010
@@ -31,7 +31,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSeMtomTest extends SpringTestSupport {
+public class CxfSeMtomTest extends CxfSeSpringTestSupport {
 
     private DefaultServiceMixClient client;
     private InOut io;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSePayloadTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSePayloadTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSePayloadTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSePayloadTest.java Thu Jul  8 06:46:59 2010
@@ -26,7 +26,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSePayloadTest extends SpringTestSupport {
+public class CxfSePayloadTest extends CxfSeSpringTestSupport {
 
     private DefaultServiceMixClient client;
     private InOut io;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTest.java Thu Jul  8 06:46:59 2010
@@ -26,7 +26,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSeSpringTest extends SpringTestSupport {
+public class CxfSeSpringTest extends CxfSeSpringTestSupport {
 
     private DefaultServiceMixClient client;
     private InOut io;

Added: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTestSupport.java?rev=961598&view=auto
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTestSupport.java (added)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeSpringTestSupport.java Thu Jul  8 06:46:59 2010
@@ -0,0 +1,15 @@
+package org.apache.servicemix.cxfse;
+
+import org.apache.servicemix.tck.SpringTestSupport;
+import org.springframework.beans.BeansException;
+
+public abstract class CxfSeSpringTestSupport extends SpringTestSupport {
+
+    public static class ClassPathXmlApplicationContext extends org.apache.xbean.spring.context.ClassPathXmlApplicationContext {
+        public ClassPathXmlApplicationContext(String configLocation) throws BeansException {
+            super(new String[] { configLocation }, false);
+            setValidating(false);
+            refresh();
+        }
+    }
+}

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeXmlBeansTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeXmlBeansTest.java?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeXmlBeansTest.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/java/org/apache/servicemix/cxfse/CxfSeXmlBeansTest.java Thu Jul  8 06:46:59 2010
@@ -26,7 +26,7 @@ import org.apache.servicemix.tck.SpringT
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
-public class CxfSeXmlBeansTest extends SpringTestSupport {
+public class CxfSeXmlBeansTest extends CxfSeSpringTestSupport {
 
     private DefaultServiceMixClient client;
     private InOut io;

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/aegis.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/aegis.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/aegis.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/aegis.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:test="urn:test">
+       xmlns:test="urn:test"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
   <sm:container id="jbi" embedded="true">
     

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/code_first.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/code_first.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/code_first.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/code_first.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:person="http://code_first/test">
+       xmlns:person="http://code_first/test"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
   <sm:container id="jbi" embedded="true">
     

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/context-injection.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/context-injection.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/context-injection.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/context-injection.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:test="urn:test">
+       xmlns:test="urn:test"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
   <sm:container id="jbi" embedded="true">
     

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:mtom="http://cxf.apache.org/mime">
+       xmlns:mtom="http://cxf.apache.org/mime"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
 
   <sm:container id="jbi" embedded="true">
 

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom/xbean.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom/xbean.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/mtom/xbean.xml Thu Jul  8 06:46:59 2010
@@ -20,7 +20,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-    >
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
+
       <cxfse:endpoint mtomEnabled="true">
         <cxfse:pojo>
           <bean class="org.apache.servicemix.cxfse.TestMtomImpl" />

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/payload/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/payload/xbean.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/payload/xbean.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/payload/xbean.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:calculator="http://apache.org/cxf/calculator">
+       xmlns:calculator="http://apache.org/cxf/calculator"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
       <cxfse:endpoint useJBIWrapper="false" useSOAPEnvelope="false">
         <cxfse:pojo>

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxy/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxy/xbean.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxy/xbean.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxy/xbean.xml Thu Jul  8 06:46:59 2010
@@ -24,9 +24,10 @@
        xmlns:mtom="http://cxf.apache.org/mime"
        xmlns:calculator="http://apache.org/cxf/calculator"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
-          ">
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
     
       <cxfse:endpoint>

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxytarget/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxytarget/xbean.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxytarget/xbean.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/proxytarget/xbean.xml Thu Jul  8 06:46:59 2010
@@ -23,9 +23,10 @@
        xmlns:test="urn:test"
        xmlns:calculator="http://apache.org/cxf/calculator"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
-          ">
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
     
       <cxfse:endpoint>

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/spring.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/spring.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/spring.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/spring.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:test="urn:test">
+       xmlns:test="urn:test"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
   <sm:container id="jbi" embedded="true">
     

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xbean_without_jbi_wrapper_without_soapenv.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xbean_without_jbi_wrapper_without_soapenv.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xbean_without_jbi_wrapper_without_soapenv.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xbean_without_jbi_wrapper_without_soapenv.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:calculator="http://apache.org/cxf/calculator">
+       xmlns:calculator="http://apache.org/cxf/calculator"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
   <sm:container id="jbi" embedded="true">
     

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xmlbeans.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xmlbeans.xml?rev=961598&r1=961597&r2=961598&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xmlbeans.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/test/resources/org/apache/servicemix/cxfse/xmlbeans.xml Thu Jul  8 06:46:59 2010
@@ -17,9 +17,15 @@
   limitations under the License.
   
 -->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"
-       xmlns:test="urn:test">
+       xmlns:test="urn:test"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+        http://servicemix.apache.org/cxfse/1.0 http://servicemix.apache.org/schema/servicemix-cxf-se-${project.version}.xsd">
   
   <sm:container id="jbi" embedded="true">